Merge pull request #1 from jcalmonte/TestMotor

Working Tests as of 7/11/14
Merge pull request #1 from seanpollard/master

Working Tests as of 7/1/14
Merge branch 'master' into TestFitproChanges