intelligent arguments parsing
Merge branch 'master' of ssh://fomich/home/curie/curie
multipe fixes; evolving bootstrapping script