Another copy edit.
Merge branch 'develop' of github.com:yahoo/mojito into develop