split sampler into two files

sampler_commandline.py is the extended tool. Use sampler.py when calling
from code.
Merge
Merge branch 'master' of https://github.com/jonasbusk/saas2014
Merge branch 'master' into refactor