Unification of Gravity and Electromagnetism II A Geometric Theory