Add category to error messages
Merge branch 'refs/heads/master' into add-category-to-error-messages

Conflicts:
	Gemfile.lock
Merge pull request #44 from theodi/add-category-to-error-messages

Add category to error messages