Fixed Sphinx makefile
Added .swp files to gitignore
Updated README for JUnit and Coverage XML output
Fix: Return nonzero exit code when doctest fails
Better use six directly, we depend on it anyway
Slight change in unittest to support Python 2.6 etc.
Added latest setup.py changes to template