Merge branch 'master' of github.com:doenietzomoeilijk/dotvim

* 'master' of github.com:doenietzomoeilijk/dotvim:
  Let's try without the if
  Let's not assume we've set PSR2 in PHPCS's defaults.
  Fixed font
  Back to Envy Code...
  Clarified SplitjoinJoin