import settings early in wsgi conf to prevent errors
fix requirements.txt to actually use django 1.5
changed to requirements
merged
edited models, views
Merge pull request #11 from batpad/master

User_type method + Checkin View