Initial configuration options added
Merge branch 'master' of github.com:wimster/wimster.github.com