Add travis config file
Merge remote-tracking branch 'origin/travis-integration' into travis-integration

Conflicts:
	.travis.yml