Changed variable names
Added hipchat submodule