Merge pull request #298 from pgreyson/master

First pass at displaying flows and traffic