Merge pull request #2 from skorokithakis/master

General cleanup, config files.
fixed base_port issues
whoops, wrong language
moved some code
Merge.