Merge branch 'master' of github.com:ariejan/dotfiles
Disable audible bell
Update 'grm' function