More changes from Kelly
Merge branch 'ui-updates' into gh-pages

Conflicts:
	_layouts/post.html