Update gem file to match master