Fixed markup in the doc
Merge pull request #17 from stof/patch-1

Fixed markup in the doc
behat.mink.base_url may not be defined
update travis config and external dependencies
Merge remote-tracking branch 'origin/2.5'

Conflicts:
	.travis.yml
	composer.lock
	src/VIPSoft/CodeCoverageExtension/Extension.php