remove www from hostnames
Merge branch 'master' of git://github.com/discore/discore

Conflicts:
	lib/utils.js