Updates to .vimrc and moved some cpp stuff to own ftplugin