Revised build into two separate apps with master build file; revised .travis.yml for this