Merge pull request#685 from duane-edgington/masterupadates to loadCANON_os2018.py wgTiny

Merge pull request#257 from duane-edgington/masterduane add OA2 mooring to load, new location

Merge pull request#151 from MBARIMike/masterAttempt to move new 1.4 tag upstream

Completed notes for 'Version 1.3: 31 January 2014'

Replace spaces in filename with _s

flot-0.7 javascript retreived fromhttp://code.google.com/p/flot/

Set env & path.