Remove custom scripts from the Travis config
Merge branch 'master' into ice-cube-and-factory-girl