Merge pull request #1 from DougEdey/master

Merge from master
Merge pull request #2 from DougEdey/master

Merge from master
Compile Fix and Configuration Fix

MashControl wasn't compiling and there was another fix to prevent a null
pointer exception when creating a new configuration
Merge pull request #13 from cmpterman2/master

Fix building with maven (compile issue and missing jar), also a fix when configuring the system for the first time