Added citr-common and some additional configuration settings
Merge branch 'master' of github.com:Liechtathlet/citr
Configuration changes