More diagnostics work

Almost done?
Merge branch 'master' of https://github.com/FRCTeam1073-TheForceTeam/robot13

Conflicts:
	RobotMap.cpp

merge