fixed ShooterPrep to Anirudh's specifications

(WhatIsThisIDon'tEven)
added stuff
fixed everything

let me know if something died
Merge branch 'master' of git://github.com/swarage/612-2013

Conflicts:
	autonomous.cpp