Adding phpfolding and updating fugitive, added new trick to prevent some issues