WIP setting up test suite
Adding mock to test reqs
Merge branch 'master' into feature/tests
Refactoring argument parsing code
Adding some tests of highly questionable worth, mostly to learn my way round Nose
Merge pull request #9 from BigglesZX/feature/tests

New feature: write some tests