update vimrc
Change default vim indentation
Merge branch 'master' of github.com:tomahh/dotfiles