Add es6 Promise shim. Appease jshint. Remove commented out code