Work around pre-existing functions and aliases.
Merge branch 'master' of github.com:aaronbieber/dotfiles