Cleanup vimrc and move some scripty stuff into the plugin folder