Try to fix issue #45 with Travis Capybara tests
Merge branch 'master' of github.com:drcapulet/mongo-tools

Conflicts:
	.travis.yml