first attempt at disqus comments
fixed typos
updated post
fixed merge

Merge branch 'master' of https://github.com/jhollist/jhollist.github.io

Conflicts:
	_layouts/post.html