Typo fixes.
Merge branch 'master' of github.com:justin/carpeaqua.com

Conflicts:
	website/feed/index.xml
	website/feed/twitter.xml
	website/sitemap.xml