Bring uthash's headers int this repository and kill submodule