Merge pull request #1 from ka2m/master

Improve code style and add new config places
Merge branch 'master' of github.com:Sicness/levitan