Tidy up
Merge branch 'gh-pages' of github.com:tonyscottpage/site into gh-pages

Conflicts:
	_includes/sidebar.html
	css/main.css
	services.markdown