Cleaned deps and added submodules

Some of my PR has still not made it into rubygems so I added them as a
submodule