Upgrade to Guard 2.x, fix deprecations