Merge remote-tracking branch 'niftylettuce/master'
Bumped version
Merge branch 'master' of github.com:twolfson/canvassmith