Merge pull request #3 from washort/master

upgrade for django 1.6
support custom user models