Fix instance blocking on startup script

This commit fixes the failure in the puppet-enterprise script that
caused the block_for_startup_script parameter to function improperly.
The script will now only wait-for-cert on agents and the default
timeout to block has been set at 7 minutes.
Merge pull request #24 from puppetlabs/startup_script_fix

Fix instance blocking on startup script