Cuba Travel for Americans?

Travel Info
Back in 2002, i traveled to Cuba with my College and stayed for three months. I want to go back desperately, but the Colleges no longer go. Does anyone know the best company to book trips to Cuba through, and the best way not to end up in jail when you come back to the US?

Travel Tips

Go through Canada or Mexico - they do not stamp your passport. You will have to change your Dollars before you go i.e. into Canadian dollars, they do not except any Amercian money at all - also no American Credit/Debit cards and ATM's are very very few and very far apart.
Can you not book through a Canadian travel agency?
Has previous answers do not bring any cigars back.
Others

Has noone told you - America is not a free country. You are not allowed to do this. You should seek asylum in a free democracy.
You cannot go there directly. Go someplace else then there like carosal.