Merge pull request #35 from thomasmckay/cleaning
general clean up of configs and testsself ack&merge
Merge pull request #35 from thomasmckay/cleaning
general clean up of configs and tests
self ack&merge