Edits and fix previous post url
Merge branch 'master' of github.com:bear-metal/bear-metal

Conflicts:
	source/_posts/2014-12-06-rails-garbage-collection-age-matters.markdown