Replacing remaining --cal calls with --calendar for consistency.  Fixes #136.
Removing trailing spaces that shouldn't be there