Fixing simulator issues and minor restructuring
Merge branch 'master' of https://github.com/naiad-auv/naiad-auv-software