update

change to 2 spaces for vimrc
update
Merge branch 'master' of https://github.com/jejekule/dotfiles