Removed extra "/" in some links
Merge branch 'master' into gh-pages

Conflicts:
	_site/2013/03/08/test-post/index.html
	_site/2013/04/12/test-post-2/index.html
	_site/blog/index.html
	_site/index.html