more packages
Merge branch 'master' of github.com:shenfeng/dotfiles

Conflicts:
	packages
clean up
ssh config