Updating to released gem depedencies
Update README example
Resolving merge conflicts
Need that lock