Visual cleanup, adjusted the stuff to clean up the things. I didn't change much.
Merge branch 'master' of github.com:warrenseely/robot