Remove excess submodules
Switch to gitorious repositories for submodules