Merge branch 'patch-flexiprep_mapping_flags' into 'develop'

Patch flexiprep mapping flags

@wyleung and @p.j.van_t_hof

This is what we discussed earlier. The temporary solution is to expose it in the command line. I've also added some notes there and did some small refactoring. It's all in the commit messages :).

See merge request !80