Launch i3 from xinitrc
Move git branch information to the left of the prompt
Merge remote-tracking branch 'origin/master'