add breaking tests for managing two connections
Merge branch 'master' into multiple

Conflicts:
	lib/test/helpers/setup-fixtures.js
	src/test/helpers/setup-fixtures.coffee
fix two-connections bugs
Merge branch 'multiple'