Vanilla is now available as a gem
Fixed merge conflicts