surround.vim now supports removing both braces with C-h
Add easymotion back
Back to having file type as first argument for Grep vim
Set up easymotion mapping