General cleanup, config files.
Merge pull request #2 from skorokithakis/master

General cleanup, config files.