Fixed CNAME record
Some slight visual changes and polish
Merge branch 'master' into gh-pages

Signed-off-by: Nils Torbjörn Petersen <kontakt@entepe.de>

Conflicts:
	CNAME