New error message - WIP
refactoring tests for the new error messags
remove commented-out lines
White-space fascism
Merge branch 'master' into error_msgs
Merge pull request #343 from ministryofjustice/error_msgs

New Error messages