Fixed sitemap; fixed entry title links
Merge branch 'journal' of http://github.com/fleishters/fleishters.github.com into journal

Conflicts:
	source/layouts/entry.haml