new theme

and textual updates
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_posts/2014-09-15-post.md
Revert "Merge remote-tracking branch 'origin/gh-pages' into gh-pages"

This reverts commit a6f81e660beac4c8769b483e22cceef0ea4d4597.