trying to get mocha-as-promised working on node 0.6
Merge branch 'master' into gh-pages

* master:
  trying to get mocha-as-promised working on node 0.6