Basic setup for testing infrastructure
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from sanguineturtle/master

Basic setup for housing tests ...