typo in build script
yet again, correct build script invocation
Fixing typo
Merge branch 'master' into cmake

* master:
  Fixing typo
  yet again, correct build script invocation
  typo in build script

Conflicts:
	.travis.yml