Pull changes from bling/dotvim