adding new functions and fixing PS1
adding tmux+iterm function and gitshortlog
removing shortterm function (added as alias)