Changes launch wait to 5 seconds from 10 seconds
Merge branch 'develop' of https://github.com/2729StormRobotics/Storm2014 into develop
Renames engage and disengage
Merge branch 'develop' of https://github.com/2729StormRobotics/Storm2014 into develop