Rearranged definitions regarding can and adapted the rest of the code accordingly.
Merge branch 'master' of https://github.com/naiad-auv/naiad-auv-software