added arbitrary merge and archive capability, fixed/cleaned-up other, added/cleaned-up comments
Merge branch 'master' of github.com:thirstler/channel-tool

Get back in sync with edits made directed in github "Doh!"