ENH: Number of iterations and options for those are not available in the config files.
Merge branches 'GreedyAtlas' and 'master'