VIM: Explicitly setting shiftwidth in gvimrc

It was not working so I fixed it
VIM: Adds smart indent
Merge commit 'smart-indent'
Removes code which I never used