Add server config and some config options
Merge branch 'master' of github.com:Glydar/Glydar