shameless forking + my own customizations
Merge branch 'master' of https://github.com/jfchevrette/dotfiles

* 'master' of https://github.com/jfchevrette/dotfiles:
  shameless forking + my own customizations