Merge branch 'ciims' into develop
Merge branch 'master' into develop
Addressing concern of #44. Still need to test and verify changes work
Updating readme for #44
Fixes #44. What the heck is going on with that migration?
If it's not one thing it's another...
Merge branch 'develop' into sapientia