Add travis build rules for upstream branch.
Default BUILD_SYSTEM in travis to cmake
Merge branch 'upstream'

Conflicts:
	.travis.yml
	travis-build