Move some aliases
Add section about command line prompt
Some changes to aliases
Add section about branches