update CNAME to use .org
Merge remote-tracking branch 'upstream/master' into jekyll-site

Conflicts:
	CNAME