Added encrypted notification key to travis yml
Added hipchat notification to travis yml
Fixed travis conflict