Cleanup and renaming to conform to style
Merge branch 'master' of github.com:corobotics/corobots