Fix migrations for 1.7 final

Fixes #334 and fixes #339
Update tests

Fix tests to work with 1.7.
Django 1.5 is now unsupported, so related tests removed.
Update travis to just use the tox envs.