hi runs on the local server

Signed-off-by: Scott Skender <sjskender@gmail.com>
Merge remote-tracking branch 'ours/master'