I wash my face with Baby Wash, followed by a gentle astringent (Clean & Clear). In the morning (under make-up) I use a generic "Olay" moisturizer and at night I use a dab of olive oil and massage it in.
I love the way olive oil makes my skin feel, but have never tried using it under make-up.