Added git branch name to prompt + movead all aliases definitions to aliases.sh