remove returned m2t struct where not needed

* add FIXME tag to `addIfNotDefault` since the function is used nowhere
* `cdata2colorindex` is not modified as per discussion in #477
Merge remote-tracking branch 'PeterPablo/simplify_m2t_return' into develop

Tested in R2014b, verified manually