Jsirois/sync/pants 1

The Grand Merge as discussed on pants-devel and offline