This is easy. You need a really great taillight and you need a really great headlight that is easy to take off the bike. The answer to that is the Light and Motion Taz1200 for the bars (a totally self contained light including battery and a true 1200 lumens) and you need a Dinotte 300R for the tail light. The Dinotte 300R is an awesome self contained light that will keep you safe. Both of these charge from USB so you can hook them to your computer at work and top them off.
Then I would have a small but lightweight helmet light to shine at drivers on cross streets. For that I recommend the Lupine Piko. It's very light and it's 900 lumens.
That's a *great* light set up that is easy on/easy off your bike.
Taz1200:
http://www.lightandmotion.com/bike/taz1200p.html
Dinotte 300R:
http://store.dinottelighting.com/300...tery-p111.aspx
Lupine Piko:
http://gretnabikes.com/Piko_3_SmartCore_2pt7.asp
This set up will give you 2200 lumens out the front when you are riding looking forward, that's just about the same as a car with low beams (1300 lumens x two lights) and a dazzling tail light that will seriously protect you from behind.
J.