Misc updates
Merge branch 'master' of github.com:sagotsky/.dotfiles

Conflicts:
	.shellrc
	.ssh/authorized_keys