Updating to the latest scotty & scotty-hastache