Removed unused variable from agent
Clearer indenting of matching process
--pull all option, only use --addchannel on first time
Tweaked parameter labels for templater