2nd Erik commit
Conflict merge Erik vs Fredrik

Conflicts:
analysis.m
control.m
metakernel_rosetta.txt

control and metakernel_rosetta added to gitignore
try again...