sync and updates: gitit, HStringTemplate and other