and otherwise fixing files and tests to do py.test.skip()s only during setup. --HG-- branch : trunk
* added some tests for implied and conflicting options * make all Session objects inherit from the base session * small cleanups with respect to test setup * separate tests a bit --HG-- branch : trunk