updated stuff
Merge branch 'master' of https://github.com/clhenrick/pelmetcam

blah blah
renamed picamera.py to picamera_test.py