Disable GSS API for 3rings.
Merge branch 'master' of github.com:jonathanio/dotfiles

Conflicts:
	ssh/3rings.conf