* upstream/master:
Update the usage text
Minor change to -f handling
travis: Run a apt-get update before installing the needed packages
Use the maximum width reported by the font if the attributes table isn't found
Remove the ability of the -f switch to accept a comma-separated list of fonts. The user is expected
to use multiple times -f whenever he wants to specify one or more fonts. This has the side effect of
enabling the user to use fonts whose name contains a comma.
