Remerge (manual) with mathiasbynens repo and make things easier to merge for the future
Merge branch 'master' of github.com:duboisph/dotfiles

* 'master' of github.com:duboisph/dotfiles:
  Remerge (manual) with mathiasbynens repo and make things easier to merge for the future