Add alias for checking out file safely
Merge branch 'master' of github.com:joshaw/zsh

Conflicts:
	completions
update