Use upstream, but still submodule for now

Signed-off-by: Ricky Elrod <ricky@elrod.me>