rename log-aliases and add one to show --all branches
terminator config was broken(?!) Fixed.
Merge branch 'master' of https://github.com/weerstand/dotfiles

Conflicts:
	.config/terminator/config
	.gitconfig
add git-aware bash prompt