clean up
Merge branch 'gh-pages' of https://github.com/kinlane/quantified-self into gh-pages

Conflicts:
	_posts/2012-08-29-efficient-social-api-development-with-singly.md
	_posts/2012-09-17-an-api-driven-quantified-self.md
	_posts/2012-09-25-the-best-team-page-ever.md
	data/companies.json