In my experience, the combination of the "Algorithms" by Rivest et al and Skiena's "Algorithm Design Manual" provides a very complete exposition of algorithms. Just make sure you work through as many of the exercises in "Algorithms" as you can.