updated .travis.yml
updated .travis.yml to only build dev branch
updated .travis.yml
merged .travis.yml from master