Add cache: true in shippable.yml
Merge branch 'master' into production