gitpoller test strings should be unicode
Do not merge branches with different codebase/project
Merge branch 'multiple-projects' of https://github.com/jollyroger/buildbot

+autopep8
don't override `time` Jinja2 parameter
escape author names in feeds

Fixes #2596
Merge branch 'waterfall-pagebuilt' of git://github.com/djmitche/buildbot
Merge branch 'master' into nine

Conflicts:
	master/buildbot/status/web/grid.py
	master/buildbot/status/web/templates/feed_description.html
	master/buildbot/status/web/templates/grid_macros.html
	master/buildbot/status/web/waterfall.py