Pull request to improve wrapping & color

Fixes issue #191 by generating color the new Thor way (new as of three months ago).

Includes some Ruby simplifications for readability.

All tests pass.