Pull conflict
Merge branch 'master' of https://github.com/weisli-r/norme-vim
Changed variables names