removed spuroius file
fixed importError in tests under django1.6
removed unnecessary whitespace
fix indentation
make pyflake8 happy
specified missing fixture for test
added django 1.6 to travis
fallback for python_2_unicode_compatible decorator for django before 1.4.2
Merge branch 'release/0.0.16.1'