Fix up --cal handling
Overzealous removal of time module
Fix setting values using raw_input for add
Merge branch 'gflags' into gflags2