Merge branch 'run_naive_interaction' into 'master'

Run naive interactions

Added an option to run the naive interactions instead of the optimized ones. These are to be used for debugging purposes.

See merge request !428