cleaned up indentation and spacing and comments, minor change to Makefiles, added const to a couple of Vehicle methods.
Merge branch 'sdev' into develop