Don't barf on bad value for timer
Don't barf on bad value for timer

I am changing the resume message to make it more general. This means
that when this gets merged upstream that we can use it rather than
maintaining our own fork.

Conflicts:

	public/js/showoff.js

kublaj/showoff,kublaj/showoff,kublaj/showoff,berkes/showoff,kublaj/showoff,puppetlabs/showoff,berkes/showoff,marrero984/showoff,binford2k/showoff,kublaj/showoff,marrero984/showoff,berkes/showoff,marrero984/showoff,nomadicoder/showoff,slambert/showoff,slambert/showoff,binford2k/showoff,nomadicoder/showoff,puppetlabs/showoff,slambert/showoff,puppetlabs/showoff,berkes/showoff,wanix/showoff,wanix/showoff,wanix/showoff,berkes/showoff,binford2k/showoff,nomadicoder/showoff,puppetlabs/showoff,nomadicoder/showoff,slambert/showoff,binford2k/showoff,marrero984/showoff