Cleaning up parser and working on tests
Merge branch 'cgldr' of github.com:cwingard/marine-integrations into cgldr