Added new error
Changed tests to reflect new error
Merge branch 'develop' into feature/issue-8-better-errors

Conflicts:
	lib/metrics-helper.js
renamed parameter to action
Change to custom error validation
Merge branch 'feature/issue-7-better-errors' into develop