added to bash and camera tests
Merge branch 'DEVEL' of http://github.com/mjmccorm/raspberrypi into DEVEL