Bringing changes up to date with other branch.
Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	resources/config.yml
	resources/plugin.yml
	src/com/worldcretornica/plotme/PMCommand.java
	src/com/worldcretornica/plotme/PlayerList.java
	src/com/worldcretornica/plotme/Plot.java
	src/com/worldcretornica/plotme/PlotGen.java
	src/com/worldcretornica/plotme/PlotManager.java
	src/com/worldcretornica/plotme/PlotMe.java
	src/com/worldcretornica/plotme/PlotRoadPopulator.java
	src/com/worldcretornica/plotme/PlotRunnableDeleteExpire.java
	src/com/worldcretornica/plotme/SqlManager.java
	src/com/worldcretornica/plotme/listener/PlotDenyListener.java
	src/com/worldcretornica/plotme/listener/PlotListener.java
	src/com/worldcretornica/plotme/utils/MinecraftFontWidthCalculator.java
	src/com/worldcretornica/plotme/utils/UUIDFetcher.java
Updates