Changes to Configurator

This should allow to make configurations much clear
Merge branch 'configurator' of github.com:hazzik/Humanizer into configurator
just a field rename for consistency