Fix pytest South migrations, removed workaround for ambassadors test
bump travis
use pytest_django from master branch for now
Revert "bump travis"

This reverts commit 6ad4647f350bf7065cf364624696dfbd941d4b15.
Merge pull request #275 from gandalfar/fix_pytest

Fix pytest South migrations, removed workaround for ambassadors test