Update for -5, unbundling uthash

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>