Fixed some config variables
Merge branch 'master' of git.kbase.us:shock_service