remove .stripMargin calls from code base

[cvogt]

there are some orphaned calls and in general let's avoid stripMargin if in any way possible, it just make the code harder to mangle.