Remove trailing whitespace in .vimrc
Merge branch 'master' into iridium