Clean Up & Intake Update

Went through some of the comments, inspected, and formatted the code.

Also changed some intake commands and the intake subsystems based on
field testing done on 2/4/14.