More work on pickups.
Merge branch 'master' of https://github.com/CodingBadgers/MineKart

Conflicts:
	src/main/java/uk/thecodingbadgers/minekart/listener/JockeyListener.java