Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/buycraft/commands/BuycraftCommand.java
Merge pull request #18 from ShadowDog007/master

Fixed merge errors