(#1147) - run watchify from dev-server.js
(#1147) - fix for standalone regression
(#1251) - put sugar
Merge branch 'master' of https://github.com/daleharvey/pouchdb

Conflicts:
	package.json