Merge pull request #196 from jrenner/master

Sorry, I forgot to change the comment
Merge branch 'master' of https://github.com/jrenner/glances
Merge pull request #197 from jrenner/master

press 'u' to view cumulative network traffic
Merge branch 'master' of github.com:nicolargo/glances
Apply patch https://github.com/nicolargo/glances/pull/197#issuecomment-14490606