Modify tab to 4 spaces, add autoindent to .vimrc
Github to Mac merge