Backfill specs for Cli (for real this time part deux)

Signed-off-by: Dan Wendorf <dwendorf@pivotallabs.com>