Sync changes from "stoney" to "master"

On stoney it's simply ```#!/bin/bash``` and ```set -e``` below the copyright header.