config and test refactor changes
Merge branch 'master' of https://github.com/thompson4822/rulez

Conflicts:
	src/main/scala/com/minutekey/DefaultMonitorService.scala
	src/test/resources/generalHealth.feature
	src/test/scala/stepDefinitions/GeneralHealthStepDefinitions.scala