Switching to upstream vim-fixkey now that my branch has been pulled