Add Django 1.6 to test matrix. Minor fixes