Add travis-ci support for master branch
Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts:
	.travis.yml