update dependencies to latest
Merge branch 'update-deps' of github.com:peterkc/co-mocha into update-deps

* 'update-deps' of github.com:peterkc/co-mocha:
  update dependencies to latest

Conflicts:
	.gitignore