Refactor
Tweak Makefile again
Remove mandelbrot2' as tests shows it was slower
Update benchmark to match recent changes