Add new fishing enchants. Fixes BUKKIT-5035
Merge branch 'master' of https://github.com/Bukkit/Bukkit into master-spigot
Merge branch 'master-spigot' into 1.7-spigot