Updated code for speed, and testing for performance under low battery.  Wifi + camera + writing + display eats up most of our power.  Battery lasts a while though.  Tested on older rev. model B (only 256 MB RAM, so moving to A should be fine too (takes forever to build), so that we use much less power.
Fixed merge conflicts