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