More seperation. Better Metrics!
Merge branch 'master' of https://github.com/vemacs/Shortify

Conflicts:
	src/main/java/com/nullblock/vemacs/Shortify/common/GenericShortifyListener.java
	src/main/java/com/nullblock/vemacs/Shortify/util/ShortifyUtility.java

Dear vemacs:

Stop trying to stick Bukkit-specific code into code that was meant to run on Minecraft Forge, Spout and Bukkit, along with having JUnit tests.

Your "help" also broke my Jenkins build.

Love,
--tuxed