Remove keychain, add HOSTTYPE and 'ls' alias
Merge branch 'master' of https://github.com/mijit/public-github

Conflicts:
	env/.bash_profile