Travis debugging
Merge branch 'master' of github.com:mroderick/PubSubJS

Conflicts:
	package.json