Electrostatic and non-electrostatic contributions to ion association in solution