Added rules & sane cleanup
Merge branch 'master' into modkey

Conflicts:
	config.h