Add foldmarkers in vimrc, clean up, other stuff