6/23/14

Switched to es6-shim, turning everything into promises