Determine oauth redirect URL based on HTTP_HOST
Merge branch 'master' of github.com:mburke13/scal

Conflicts:
	apps/scal/index.php