merge commit
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014

Conflicts:
	trunk/Software/MPLABX/Projects/UnoFrontBack_v2/nbproject/Makefile-genesis.properties

blahhh
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014
460800 baudrate