added stompit alias
added timestamp to bash history
fixed git branch output in bash
default git push tracks branch and set mergetool
use sublime to open gems
Merge branch 'master' of github.com:pzi/dotfiles