Intake Update

Intake update from 2/2/14. More organized and now catapult will not fir
until it is extended and default position is now maintaining its current
position.
Merge branch 'master' of https://github.com/team3042/AerialAssist-master