Reverting changes to only allow one protocol at a time
Merge branch 'master' of github.com:WoTio/pontifex

Conflicts:
	bin/pontifex
	lib/Pontifex.coffee