NOJIRA - Fixed a number of CS issues, mostly related to whitespace chang...

...es. Relaxed the rules around trailing whitespace specifically.