Bug fixes.  I need to have UI testing otherwise renaming stuff can have bad consequences.
Merge branch 'master' of https://github.com/noogen/phuncms