added python 3.3 and django 1.6 to travis testing
fixed exception handling syntax for python3 compatibility
use six.string_types instead of basestr for python3 compatibility
removed django 1.4 from travis testing, added python 3.2 and 3.4
removed python 3.2 from travis testing
preserved django 1.4 compatibility by taking only what we need from six
exclude Py3/Django1.4 tests
Merge pull request #34 from hwkns/develop

Fixed Python 3 compatibility, added Django 1.6 to Travis testing
bumps version to 0.2.1
bumps version to 0.6

because there is a 0.5 version on pypi that was not tagged in git
Merge pull request #1 from stefanfoulis/develop

Sync sources