Cleanup
Merge branch 'refs/heads/reveal.js'
Merge branch 'master' of github.com:thejamesdempsey/are-emotions-christian

Conflicts:
	config.codekit
	css/screen.min.css