slight cleanup
kill CRLF (dos2unix)
clean whitespace
tabs > spaces
more whitespace fixes
Merge formatting changes into master
Bugfixes and refactoring.
More bugfixes for warrick integration.
merging alternate history

This contains the same changes,
but replayed after whitespace normalizing