CI: only build master branch
CI: only build master branch
Merge branch 'master' into work

Conflicts:
	.gitignore
	.travis.yml