use ip/port from hosts.conf
Merge branch 'master' into diffbot-testing
widget page updates
Merge branch 'master' into diffbot-matt
Merge branch 'master' into diffbot-testing
fix injecting