Update travis config
Merge branch 'dev'