implementing automerge
Merge branch 'browserify' of github.com:prose/prose into automerge