Lots of stuff.
Merge branch 'master' of https://github.com/Incomprehendable/iTrail.git

Conflicts:
	iTrail/src/me/incomprehendable/plugins/trail/cmd/TrailCommand.java
	iTrail/src/me/incomprehendable/plugins/trail/gui/items/HeartTrailButton.java