Only set cryptmethod if its available.
Merge branch 'master' of github.com:kablamo/dotfiles

Conflicts:
	links/.vimrc