resolved key conflict between php linter and redraw
Merge branch 'master' of https://github.com/jvinet/dotfiles