starting problems

I'm having trouble turning on my 95 disco, when i turn the key the car starts but the rpms drop and it shuts down. Then i restart it and give it gas the car stays on but, once it starts and it stays the rpm goes up and down. When the car warms up rpm stays a little normal but car still vibrates if someone can help me outin this it will be appreciated. also I did a complete tune up but when i had to change the cap and rotor i took all the wires off and followed the manual to install them in the proper order but the diagram that i have is to small an i think that the wires are connected wrong if someone has a pictures of this or knows where i could find one

Yeah, if you did the wires wrong, it would definately cause a lumpy idle and it wouldn't want to start very easily. I'll see if I can take a pic of our LR's wires so you can have something to go off of. I won't be able to take a pic until tonight though.