updated and cleaned up
Merge branch 'master' of github.com:dlakaplan/raspberrypi_python