general improvements
Merge branch 'master' of github.com:hoylemd/homedirscripts

* 'master' of github.com:hoylemd/homedirscripts:
  made tabs 2 spaces
  added tmux
  added heroku key

Conflicts:
	.vimrc