remove cache and update before_script
Merge branch 'master' into feature/11-travis