Updated .gitignore.
Merge branch 'master' of github.com:OpenPhilology/phaidra
Upgraded Django and Tastypie. Resolves #22.
Merge pull request #23 from OpenPhilology/api

Upgrade Django and Tastypie.