merge w/conflicts, add touch-punch plugin