Tidying up src/ folder + minor tweaks in interface
Merge branch 'master' of http://github.com/JoeyJo0/eca-rule-engine