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

* 'master' of https://github.com/skwp/dotfiles:
  Remove redundant recommended OSX tool 'autojump'
Merge branch 'master' of https://github.com/jby/dotfiles

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