Update Maven and Ant to use 1.7.2 Bukkit
Merge remote-tracking branch 'origin/2.x' into 2.x