Add Totango link to website
Resolve minor conflicts