upgrading browserified modules
removing trailFix, making trailing slash optional
fixing merge conflict
Merge branch 'browserify' of github.com:prose/prose into backbone
implementing automerge
updating CONTRIBUTING.md with automerge instructions
Merge pull request #324 from prose/backbone

upgrading Backbone.js #316 (and all browserified modules)