PEP 8, people
Merge branch '2013PreSeason' of github.com:grt192/GRTPyFramework into 2013PreSeason

Conflicts:
	py/grt/mechanism/shooter.py