Added support for ms in addition to mil

This seemed to work fine for me.

I kept "mil" in for backwards compatibility.

P.S. Sorry about the extraneous changes, my editor cleans up spaces to the right automatically.