Fixes
Merge branch 'simplified' of https://github.com/lypant/archconfig into simplified

Conflicts:
	customize