refactoring
Merge branch 'master' of https://github.com/bwallace/OpenMeta-analyst-