That sounds right to me, the +5 and ground.  As for wiring it nicely, you could get some shrink wrap cable stuff, you run all the wires thru it then heat it up with a hair dryer so it makes it into one larger wire
_________________________
__________________
15" MBP late 2008