Make sure we are rescuing StandardError and not Exception
Merge branch 'staging' of github.com:saarinen/overlay_publisher into staging