Testing update
Merge conflicts fixed from origin master pull
cleaned up troubleshooting code
Merge pull request #87 from JustAboutJeff/model_testing

Testing update
fix merge conflicts