update
Merge branch 'master' of github.com:mrseaman/mrseaman.github.com

Conflicts:
	blog/archive/index.html
	blog/category/general-stuff/1/index.html
	blog/category/general-stuff/feed/atom/index.xml
	blog/category/general-stuff/feed/index.xml
	blog/category/general-stuff/index.html
	blog/feed/atom/index.xml
	blog/feed/index.xml
	blog/index.html
	blog/page/1/index.html
	favicon.ico
	index.html
	themes/theme1/style.css