Merge pull request #114 from moaa/master

Split up configuration and added EventMap reloading