Added .gitignore
Adds Django 1.6 support
Updates version to 1.0
Updates README.txt
Updates .gitignore
Merge remote-tracking branch 'upstream/master'