Still trying to merge...
Merge branch 'master' of https://github.com/forstezt/linux
Edited .vimrc to use 4 spaces instead of tabs.