Merge branch 'next'

* next:
  chore, mention pimmel.h where it belongs in libpimmel.la SOURCES
  minor, refactor subscription code into sub.[ch]