Merge pull request #3 from ocefpaf/master

Merging latest local SECOORA repo with IOOS/SECOORA
Merge remote-tracking branch 'upstream/master'