Add pacman aliases
Fix number of issues due to bad merges
Merge branch 'linux'

Conflicts:
	zshrc