Merge pull request #252 from scrollback/testing

Testing
Merge pull request #254 from scrollback/testing

don't generate coverage for test files
Merge branch 'master' into testing