Merge bundles and re-enable vim-go bundle. Add tmux support