rough implementation of scalastyle:ignore
id support for onliners
oneLiners now span the whole line
Added tests for one line ignores
Also removed scalastyle problems
Merge branch 'merge-68'
More corrections to tests