Added token calculation on startup
Updated wait script.  Count was incorrect.

Fixed Ec2Snitch capitalization