Use flake8 2.1 and django 1.6
Build and test with Django 1.4, 1.5, 1.6
Merge branch 'feature/django-matrix' into develop