wip
Merge branch 'gh-pages' of github.com:mxcl/PromiseKit into gh-pages