first pass at unsub feature
Minor config refactor
Merge branch 'unsubscribe'
Some refactorings