_block_until now actually uses the 'timeout' arg
Merge pull request #56 from seandst/ec2-mgmt-system-oops

_block_until now actually uses the 'timeout' arg