update
Merge branch 'master' of github.com:moritzf/config-files
update
using theirs
configured .vimrc