wip
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/demo.rb
Merge branch 'master' of github.com:dinshaw/promises

Conflicts:
	lib/demo.rb