Moved wojtek.vim contents to my_config.vim
Merge branch 'master' into windows