added tab/whitespace settings
Merge branch 'master' of https://github.com/wrwright/.vim
updated local