General fixes

Configuration files are now merged, my.config added to gitignore, example my.config added and interface slightly cleaned up.