Update as we finalize code

Snapshot of code as we head into the final weekend before our first
competition
Merge branch 'master' of https://github.com/ConnorFoody/FRC-2014

Conflicts:
	README.md