Add cocoon gem
Add comment
Merge branch 'master' of github.com:jmuheim/base into features/user_vocabularies

Conflicts:
	Guardfile
Add cocoon