I am a Yogini myself... big fan of a regular stretch routine three to four times a week. I am actually a yoga instructor and I often open my classes with a neck roll exercise.
A quick 3 minute routine you can do anywhere....home, office, plane... for neck and shoulders.
1. Roll your ear to one shoulder, pressing the opposite side down muscularly.
Then roll your head to the opp side.
2. Come back to the first side, right ear to right shoulder, and hold there. Taking the first two fingers on your right hand, go behind the back of your left ear and press tiny circles down the long muscle you feel all the way to your left shoulder, loosening up tension being held there. Repeat on the opp side.
3. After that, roll your head, beginning with an inhale through your nose, to your right shoulder, exhale back, chin to the sky, inhale left ear to left shoulder, and exhale back to center. Reverse to opposite side. Then Repeat once more on each side.