Small fixes for Django 1.5 and TravisCI