Some changes
Merge branch 'master' of https://github.com/amaasbier/slaughtergeist.git

Conflicts:
	config.lua