Some fixes for binning options.

Turns out that the parser does not like the alphanumeric mix before
and has been throwing errors for the more exotic binwidths like
'2month'. To fix this, everything has changed to words, and the
appropriate switches are added to the appropriate places.