Intermediate commit re merging defaults
More tests and fixes
More tests fixed...
Make all tests pass under Python 3.4 (finally!)

Some are marked as xfail because I'm unsure what should be done to them.
Fix tests for Python 2.x