Change php indentation back to 4
Add vim-surround