Fixed Octopus Tools command line options for bool/flag based options.

Also changed the map to a cli string from a reflection based function to
something more explicit.
Merge pull request #147 from saxonmatt/master

Fixed Octopus Tools command line options for bool/flag based options.
Fixing bugs introduced with last push *sigh*
Merge pull request #148 from saxonmatt/master

Fixing bugs introduced to OctoTools in last push *sigh*
Merge branch 'master' into develop