Updated dependencies, changed travis.yml
Merge branch 'failing-integration-tests' of github.com:oskopek/carcv into failing-integration-tests

Conflicts:
	.travis.yml