Augmented Time-Stepping Integration Of Non-Smooth Dynamical Systems