add vim-surround
add submodule rainbow to color square brackets
aa
Merge remote-tracking branch 'origin/NB' into PC

Conflicts:
	.gitmodules
	vimrc
aa
aa
change to 64bit YCN