Syncing latest changes
Merge branch 'master' of github.com:leek/dotfiles

* 'master' of github.com:leek/dotfiles:
  Sync