Fix result indexing

Previously results after the first page were off by one
Merge branch '1.6'
Adding support for the bukkit's horse API