save swapfiles to /tmp
update plugins
 * Update Plugins
 * Make CtrlP ignore .git directory
Merge branch 'master' of github.com:nachtwandler/vim-config
 merge
Conflicts:
	.gitmodules
	bundle/gocode
	vimrc