Lowercase some words and add some others
Merge branch 'master' into apricot
Turn off sound beeps in gvim
Merge branch 'master' into apricot