start of refactoring to address issue #90
Merge branch 'master' of github.com:monarch-initiative/monarch-app