Clean up vendor
Merge branch 'master' of github.com:danhigham/cfoundry

Conflicts:
	vendor/errors