Updated to work with late model Ruby, a few changes to gems