https is good
removing broken bundles
Adding ctrlp mappings I like.

Conflicts:
	.vimrc.local
Adding golang and colorcol
Defining bundles.
Merge branch 'master' of github.com:jmervine/vim-config
Updating go handling.
Merge branch 'master' into centos