Make -v and -q mutually exclusive
Merge pull request #17 from sjagoe/better-argument-parsing

Make -v and -q mutually exclusive
Merge remote-tracking branch 'refs/remotes/origin/master' into add-haas-test-suite