switched to local user cabal installation
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.xinitrc