merge w/conflicts, add touch-punch plugin
Just committing files coz git told me so