added new hosts to ssh config
changed os x editor to be vim
Merge branch 'master' of github.com:zanshin/dotfiles