Clean up old dependencies
Add go bundle to vim plugins
Resolved conflict