Merge tag '1.4.0' into gh-pages

Conflicts:
	_config.yml
	_posts/2011-03-10-sample-post.md
	_posts/2012-05-22-readability-post.md
	_posts/2013-05-22-sample-post-images.md
	_posts/2013-05-23-readability-feature-post.md
	_posts/2013-06-25-video-post.md
	_posts/2013-08-16-code-highlighting-post.md
	about.md
	theme-setup.md