add more debuging to dea on warden connection error
add some debugging to figure out why build is failing on jenkins
increase port connection timeout from 1 to 5 seconds
attempt (again) to make tests pass on jenkins
Merge branch 'master' into ironfoundry

Conflicts:
	Gemfile