Fixed the conflict that keeps my ls alias from working
Added sshiphone
Merge branch 'master' of https://github.com/mcclurem/configs

Conflicts:
	.bash_profile