Event Shapes and Power Corrections in e+e- Annihilation