Got rid of ls alias and added spiff alias
Merge branch 'master' of https://github.com/dacarlin/dotfiles
Merge branch 'master' of https://github.com/dacarlin/dotfiles

Conflicts:
	.pymolrc
Modified .pymolrc