backported changes from vim.  Share dir is now saner
Merge master. Fix conflict