Bump highline to 1.6.18
Bump ffaker to 1.15.0

This will fix a bundle conflict when I switch between 1-3-stable and master branches.