Fix dependencies and removed submodules for git heroku compatibility