Tidies up code ready for next update
Merge branch 'master' of https://github.com/reggieb/Dibber