colorized ls, tree; removed tstxt (because that's already in /etc/bashrc)
started a .ackrc file
Merge branch 'master' into develop
changed ownership of output img file to $USER (instead of root, as it would have been)
Merge branch 'master' into develop
let's see how long these batteries last on the RPi
Merge remote-tracking branch 'origin'