Updating so that command line version works with Bill's configuration update
Merge pull request #98 from eparsons/master

Added a testconfig and altered main.cpp to use configuration objects.