Merge pull request #26 from bugman80/master

fixes for Django 1.6 and other minor fixes