Merge branch 'master' of https://github.com/mathiasbynens/dotfiles

* 'master' of https://github.com/mathiasbynens/dotfiles:
  .gitconfig: Remove global remote branch
  bin: Point `subl` to the default ST3 location
  .aliases: Add `-F` to `ls` aliases
Merge branch 'master' of https://github.com/rkJun/dotfiles

* 'master' of https://github.com/rkJun/dotfiles: