Add configuration flag for displaying HUD on space change
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:leonardt/Amethyst

Conflicts:
	Amethyst/AMConfiguration.m
	Amethyst/default.amethyst