add whitelisted branches to .travis.conf
conditional JS tests and ocular fixes