Merge branch 'master' of git://github.com/drzax/dotfiles

* 'master' of git://github.com/drzax/dotfiles:
Add jumpcut to install list
Add mailbox

Conflicts:
init/10_osx.sh