Merge branch 'master' of git://src.twobees.de/dotvim into master