Add go-humanize and hk

and sort Software alphabetically