vimrc: ts=8 et sw=8 sts=8
Merge remote-tracking branch 'upstream/master'