Simple Theme Setup
CSS Fixes. Disqus added
Merge branch 'master' into simple

Conflicts:
	_config.yml
	_data/authors.yml
	_data/navigation.yml
	_includes/disqus_comments.html
	_includes/scripts.html
	_sass/_layout.scss
	images/site-logo.png