Merge branch 'master' of github.com:sk89q/commandhelper

Conflicts:
	src/main/java/com/laytonsmith/core/AliasCore.java