Fixed some issues that came up during the merge.
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014.git

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