Use godep everywhere. It supports the vendor folder, and I find it's still a great solution (and saves me using submodules).