Correctly display units in file sizes

So you don't get '0 MB' when uploading something less than a MB.  Displays B, KB, MB and GB.
Do sizing simpler
Merge remote-tracking branch 'origin/master' into hr-filesize-broken
Merge pull request #320 from nla/hr-filesize-broken

Correctly display units in file sizes