Fixed some issues and added git show
Massive rewrite to the statusline. I took out the stupid and went with less stupid
Merge resolution