update gitignore
new config
update gitignore
fine...
stop tracking cache
new site
update to github page
new site
Merge branch 'source'

Conflicts:
	.gitignore
	archives.html
	author/nicholas-potter.html
	authors.html
	categories.html
	category/misc.html
	feeds/nicholas-potter.atom.xml
	feeds/nicholas-potter.rss.xml
	index.html
	tags.html
	test-page.html
	theme/css/main.css
	theme/css/pygment.css
	theme/css/reset.css
	theme/css/typogrify.css
	theme/css/wide.css
	theme/images/icons/aboutme.png
	theme/images/icons/bitbucket.png
	theme/images/icons/delicious.png
	theme/images/icons/facebook.png
	theme/images/icons/github.png
	theme/images/icons/gitorious.png
	theme/images/icons/gittip.png
	theme/images/icons/google-groups.png
	theme/images/icons/google-plus.png
	theme/images/icons/hackernews.png
	theme/images/icons/lastfm.png
	theme/images/icons/linkedin.png
	theme/images/icons/reddit.png
	theme/images/icons/rss.png
	theme/images/icons/slideshare.png
	theme/images/icons/speakerdeck.png
	theme/images/icons/stackoverflow.png
	theme/images/icons/twitter.png
	theme/images/icons/vimeo.png
	theme/images/icons/youtube.png
new site