cache dir
nikola bound
ignore the noise
Merge branch 'master' of github.com:douglasgoodwin/douglasgoodwin.github.com

Conflicts:
	.doit.db
	.gitignore
	cache/.mako.tmp/base.tmpl.py
	cache/.mako.tmp/base_helper.tmpl.py
	cache/.mako.tmp/bootstrap_helper.tmpl.py
	cache/.mako.tmp/comments_helper.tmpl.py
	cache/.mako.tmp/crumbs.tmpl.py
	cache/.mako.tmp/disqus_helper.tmpl.py
	cache/.mako.tmp/googleplus_helper.tmpl.py
	cache/.mako.tmp/index.tmpl.py
	cache/.mako.tmp/index_helper.tmpl.py
	cache/.mako.tmp/intensedebate_helper.tmpl.py
	cache/.mako.tmp/list.tmpl.py
	cache/.mako.tmp/listing.tmpl.py
	cache/.mako.tmp/livefyre_helper.tmpl.py
	cache/.mako.tmp/moot_helper.tmpl.py
	cache/.mako.tmp/tags.tmpl.py
	conf.py
	output/archive.html
	output/assets/css/bootstrap.css
	output/assets/css/bootstrap.min.css
	output/categories/index.html
	output/index.html
	output/rss.xml
	output/sitemap.xml
mess