Fix for some folding related issues

Fixes issue described here:
https://github.com/Lokaltog/vim-easymotion/issues/64