Updated the motor code
Added heater code.

Merge branch 'master' of http://github.com/jdkaplan/ASTRO