Removed merge strategy from build.scala since uniform now handles that.
Changed encrypted keys to work with public travis.