Dependencies, Ruby errors, minus conflicting change

This has been previously approved but it had one extra conflicting commit that I've taken out.