Test updates, cleaned up util promise
Merge branch 'master' of github.com:tmanderson/BMaps