Merge pull request #376 from Jedwondle/master

Beginning work on the configuration tool.