pulled from most recent master
yup
Merge branch 'master' of https://github.com/ryanhburbank/flashcards into usermigration_modelvalidations
Validations on the models have been completed and testing is 60% completed, extensive changes to the migrations for consistency of field and attribute names