Removed use of ambiguously named variables
REmoved more ambiguous variables
Merge branch 'master' of https://github.com/TCFMark/lackbot.git