Add optional server name
Merge remote-tracking branch 'DerManoMann/hipchat_server'
Rename server to host
Merge remote-tracking branch 'origin/master'