Updated some deps to make it ruby-2 compliant