Do not include author affiliation city if blank in input file.
Re-word CC-BY license text to not use a comma. Fixes #111.
Merge pull request #135 from gnott/tweaks

Tweaks