fixed reading time and disappearing nav
Fixed social sharing and bgclip
Merge branch 'grayscale-theme' of github.com:johnmoxon/johnmoxon.github.io into grayscale-theme

Conflicts:
	_config.yml
	_includes/themes/grayscale/default.html
	_includes/themes/grayscale/post.html
	_posts/2014-04-23-encoding-video-for-html5.md
	assets/css/all.css
	assets/js/all.js
	index.md
	src/css/base.css
	src/js/main.js
	src/sass/_posts.scss
	src/sass/base.scss