Fixed time rendering
Merge branch 'master' of https://github.com/slightly-innovative/slightly-innovative.github.io

Conflicts:
	_layouts/post.html
	_posts/2014-05-16-sample-post-1.markdown