Merge pull request #6 from mwolff44/master

Merged in develop (pull request #1)
Merge pull request #10 from mwolff44/django1.6

Merge pull request #6 from mwolff44/master