Saving state of work in progress.
Bringing in TW changes.

Conflicts:
	_config.yml
	layout/_partial/archive.ejs
	layout/_partial/article.ejs
	layout/_partial/footer.ejs
	layout/_partial/head.ejs
	layout/_partial/header.ejs
	layout/_partial/sidebar.ejs
	layout/_widget/category.ejs
	layout/layout.ejs