Switch dependencies over to new gem forks