Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of ssh://ssh.github.com:443/nwinkler/bash-it