Sort out dependency mess
Update gems