Removed buf surf plugin since I wasn't using it and it was breaking things
Changed undo directory to tmp and added folding