* upstream/master:
Account for height of monitors in sorting.
bar -> lemonbar in .gitignore, remove config.h in .gitignore
Rewrite *p, *(p+1) as p[0], p[1] for readability.
Keep percent signs if not followed by {} block.
The before code would skip a percent sign even if it was not followed by a {}
block. The after code checks the same condition but only advances p if a {} block
is found and otherwise passes it through as text.
An error will not be printed if the parameter to `T` is not valid (- or
a number) and the token will be eaten (just like when an invalid
attribute is found)
* 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.
