add/remove some ssh hosts
Merge branch 'master' of github.com:jasonventresca/dotfiles

* 'master' of github.com:jasonventresca/dotfiles:
  added another ssh box
  scrolloff = 5 in vim
  heroku

Conflicts:
	dotfiles/bashrc