Move to when/then
Merge pull request #49 from tiger-swallowtails-2014/sgh-add-asynchronous-promise-means-for-passing-to-map-controller

Move to when/then
per discussion; much gratitude - Kelly