Update MayorMovementListener.java
Merge branch 'patch-2' of git://github.com/Shadow-Ninjax/Plugin-WildWest into Shadow-Ninjax-patch-2

Conflicts:
	src/main/java/net/daboross/bukkitdev/wildwest/MayorMovementListener.java