Fix shape.units. Closes #9
Merge branch 'gh-pages' of github.com:blacklabel/annotations into gh-pages