Quite a few improvements here

* Modified some (git)aliases
* Changes to the prompt functionality and color
* Improved history-usage