Django 1.5 support fixes
Change build matrix to test django 1.5 and 1.6