Update ssh_config, install ansible-yaml vim plugin
Merge branch 'master' of github.com:tombamford/dotfiles

Conflicts:
	ssh/config