We do need this stuff, Cap 3 breaks the API.
Merge branch 'master' of https://github.com/conatus/dotinfo

Conflicts:
	Capfile
	Gemfile