A Second Generation Multi-State Empirical Valence Bond Model for Proton Transport in Aqueous Systems