safety commit
Merge branch 'master' of https://github.com/dHelmgren/Portland-Indie-Speed-Run-2013
Button callbacks up in here
Merge branch 'master' of https://github.com/dHelmgren/Portland-Indie-Speed-Run-2013
Temporary addition of state switching via keyboard