Unalias \rm to avoid script errors
Merge branch 'master' of https://github.com/chrismwendt/home