Only build the 'travis' github branch on Travis
Merge branch 'master' of github.com:raboof/notion into travis

Conflicts:
	.travis.yml