Changed phpstorm settings
Merge branch 'master' of https://github.com/julien-rodrigues/dotfiles