Update dependencies, standardize utils
Switch to spigot