Added git branch print out for terminal line
Aliased tmux to 256 colors, set TERM different but think it will need to change, and sourcing bash_profile elsewhere
Added ph alias which pushes HEAD to origin
Added 256-color to tmux conf but idk if this is necessary.  Probably not with the -2 alias in the bashrc
Set the term in vim to screen-256color which I believe is correct.  Will need to look at the export call in bashrc.
Fixed merge conflict