travis
skip install
Merge branch 'master' into develop
put the install back in