committing
Merge branch 'master' of https://github.com/bakoenig/config

Conflicts:
	.Xdefaults
aspire changes