Add commons-cli as dependency.
Trim trailing whitespace.
Merge in Aditi's work from last fall.