Removed specific aliases better located in .local_aliases.
Add usefull aliases.
Merge branch 'master' of https://github.com/Weltraumschaf/dotfiles

Conflicts:
	_gitconfig