still working on getting the sidebar
Merge branch 'master' of github.com:keflavich/pelican-themes

Conflicts:
	mine/templates/base.html