Merge branch 'nonbc' of github.com:ceeram/opauth into nonbc

Conflicts:
	lib/Opauth/Opauth.php
	lib/Opauth/Request.php