Changed import statements to new arrangement of models.py
Merging settings.py
Merge branch 'master' of https://github.com/josiahseaman/skittle