shortened the names of some of the config items
Merge branch 'master' of github.com:mbeddr/mbeddr.core