Merge pull request #26 from akshayjshah/master

Support Django 1.7
Fix bash comparisons