Add swim cd alias.
Switch to spaces from tabs.
Merge branch 'master' of github.com:afishnamedsquish/dotfiles

Conflicts:
	bashrc
Merge branch 'master' of github.com:afishnamedsquish/dotfiles

Conflicts:
	bashrc