Merge remote-tracking branch 'jakewins/master'

Conflicts:
	djmoney/models/fields.py
	djmoney/tests/__init__.py
	djmoney/tests/model_tests.py
	djmoney/tests/testapp/models.py
	setup.py
add django-reversion to tox.ini
didn't merge that import correctly
Merge remote-tracking branch 'jakewins/master'

Conflicts:
	djmoney/models/fields.py
	djmoney/tests/model_tests.py
	djmoney/tests/testapp/models.py
	setup.py
fix version
fix travis config
fix relative import
fix py3 ImportError
Merge pull request #53 from ashleyh/master

Fix py3.x regressions