Merge pull request #1 from sean-brandt/master

Updates to resolve some duplicate output in 'who' and others.