reduce the sleep after a VM error

120 is crazy long
update celluloid
correct a spec
Merge branch 'master' into staging