Merge branch 'master' of https://github.com/bosgood/chi-text

Conflicts:
	config/locales/es.yml
Merge branch 'master' of https://github.com/bosgood/chi-text

Conflicts:
	config/locales/es.yml
Merge branch 'master' of https://github.com/bosgood/chi-text