Merge pull request #1202 from qwcode/issue-70

option parsing fixes
- consolidate the option tests into one test module
- replace the complex multi-assert tests with simpler ones
- add more tests to confirm our option precedence
have --version report the version of pip that's running, not installed