all.sample: reorg all.sample and add needed vars
Merge pull request #16 from weshayutin/master

all.sample: reorg all.sample and add needed vars