I don't think you need to learn really hard core math to do CS. In my experience, the one most important "genre" of math was discrete mathematics. My textbook was Elements of Discrete Mathematics, and I think it was a really great intro: http://www.amazon.com/Elements-Discrete-Mathematics-Computer...