promises added, cleaned up error handling
Merge branch 'master' of https://github.com/arring/MDO-RallyApps