Update travis config
Merge pull request #421 from bem/travis

Update travis config