Add django 1.6 to test builds
Merge pull request #318 from steventlamb/ops

Add django 1.6 to test builds