progress on https://www.pivotaltracker.com/story/show/73647934
Merge branch 'master' of github.com:concord-consortium/drawing-tool