scripts: sync with master

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
saucy: should build now

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>