Update to new CLIntegracon Patch

mrackwitz/CLIntegracon#2 got fixed.

## TODO:
* [ ] Fix regressions
* [ ] `rake spec:rebuild_integration_fixtures`
I think we could call migrate first and then integrate, and only save if there are changes in the xcconfig integration, but I'm not sure