Use ruby 2.1.3 on shippable
Merge branch 'master' into production