Remove broken link
Merge branch 'master' into fix-broken-link

Conflicts:
	_posts/2014-05-01-going-live.md