Added button controls
changed config files.
Merge branch 'master' of https://github.com/TrojanRobotics/FRCTeam-2386-2013