Redirect to the canonical hostname
Merge branch '0.2.x'

Conflicts:
	lib/app.js