Reformat work_queue_catalog reporting function.
add long options to makeflow man page
match option_triplet styling to rest of man pages
remove old option '-w'
Merge pull request #4 from rampantmonkey/long-option-documentation

Long options documentation for makeflow.
Fixes comparison master-worker work queue version

It adds a hyphen to the version string, as:
3.8.0-TRUNK.

This makes comparing the version strings easier, rather than
looking for spaces.

This commit also fixes work_queue_catalog, using the correct
task_running field, rather than the number of workers working.
clear out old, useless state
Merge branch 'master' of github.com:cooperative-computing-lab/cctools