Adding Hipchat
Fixing conflicts