various adjustments to get app/tests running
merge
fixing up tests
Merge pull request #5 from dbashford/master

various adjustments to get app/tests running