Removed pacman aliases
Added HISTCONTROL
Merge branch 'master' into arch

Conflicts:
	.bashrc