Update for spigot 1.8. Closes #17