corrected spelling
Merge pull request #300 from marcosdiez/master

Dumpscript now has hooks to a file called import_helper.py
extra dumpscript unittests validates the resulting python syntax
make flake8 happy
missing whitespace around operators
remove x-bit
Support all annotation tags with the command notes
fix reset_db would set OWNER = None with no db user

If you use postgresql, and you're lazy like I am and don't set a
username and let postgresql just use $USER, your settings.DATABASE_USER
will be `None`. This makes the existing code do this:

    Executing... "CREATE DATABASE db_name WITH OWNER = None ENCODING = 'UTF8' ;"

This change ignores WITH OWNER when there is no user.
style: make string concatenation whitespace leading

It's weird how it's all leading whitespace and then switches to trailing.

Also snuck in a change to remove unnecessary paren. Now that
line is almost under 80 cols wheee.
Merge pull request #303 from areski/master

Command notes - add annotation tags
Merge pull request #304 from crccheck/resetdb-no-username

resetdb: fix reset_db would set OWNER = None with no db username for postgresql.
convert doctests to unittests and only run uuid tests if uuid is not shipped with python (version < 2.5)
add six to install_requires, refs #288
add conditional imports for force_unicode and use six for python 3 support, refs #288
use as in except, refs #288
conditional StringIO import, refs #288
update django version for tox, refs #288
add tests for Django 1.5 and Python 2.6, 2.7 and 3.3, refs #288
Merge branch 'master' into pipchecker
Fixed some pep8 errors