Including "wait" gem to implement wait_for semantics.
Cleaned up command api to return Command objects instead of hashes.