Merge pull request #1 from budparr/master

home page madness
Merge pull request #9 from aeick/master

merge master from content work
need more testing domains!
Merge branch 'gh-pages'

Signed-off-by: budparr <budparr@sonnetmedia.net>

Conflicts:
	CNAME