Add shortcut for reloading vimrc
Merge branch 'master' into linux