Merge branch 'master' of github.com:cargomedia/pulsar-rest-api into refactor-stuff

Conflicts:
	lib/pulsar/task.js
	test/pulsar.js