Remove merge stuff
Update bukkit-parent to 0.16
Update version to 0.16.0