Un-Revert and put back: "Merge branch 'SlaveInfo' of git://github.com/jaredgrubb/buildbot""

This reverts commit f518276b3a6e88a6b079a4e2661a152087eedd15.

Conflicts:
	master/buildbot/test/unit/test_buildslave_base.py
SetSlaveInfo: fix bug in implemenation
Add the 'slave info' table to the buildslave web page
Merge jaredgrubb/buildbot:SlaveInfo-UnRevert (PR #1109)

+autopep8