Merge branch 'master' of https://github.com/CGCookie/script-bakery

Signed-off-by: Jonathan Williamson <jonathan@cgcookie.com>
Merge branch 'master' of https://github.com/CGCookie/script-bakery