merge upstream
Merge branch 'master' of github.com:mikew/dotfiles

* 'master' of github.com:mikew/dotfiles:
  adds ssh-tmux-login to examples