cleaned up travis in package.json
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp