Updated Travis CI configuration.
Merge branch 'master' of https://github.com/alan-donnelly/git-1.8.1.2

Conflicts:
	.travis.yml