Fix URI management in BitID
Merge branch 'master' of github.com:bitid/bitid-demo

Conflicts:
	lib/bitid.rb