Gitprompt rebasing support
Gitprompt replace lightening bolt with asterisk

iTerm does not properly colourise the lightening bolt
Ignore terminal solarized options in MacVim
Run test at line number support

* Change leaders
* Refactor test running functions
Missing new line?
New git aliases

And clean up some old ones.