Changed .gitattributes to make line endings correct for everyone (CRLF/LF)
Fixed problems with latest simplification changes.
Merge branch 'fix-simplification' into fix-crlf
thelmuth/fix-crlf and simplification fix
Merge branch 'master' into experiments