tag a feature with the right version number
Merge branch 'master' into release

Last-second manual fix.
fix version number so that we actually call ourselves v1.2.0