Merge branch 'master' of github.com:bitpay/bitauth

Conflicts:
	.gitignore
	README.md
	package.json