moved tests for travis
use duck-typing to distinguish strings from lists
fix travis
moar testing
typo
fix travis
exclude django 1.4 for now
removed 2.5ism
bail out on python2 and django1.4
re-enabled django14
fix py3k import
fix py3k compat
added six to the reqs
removed django1.4 from tests
removed py2.5 from travis
fixed test
version bump
Merge branch 'refs/heads/develop'