Moar fixes
Merge branch 'feature/rest-api' of github.com:vpassapera/ilios into feature/rest-api