wrap-mode everywhere
Tab to 2 spaces
Lintmode removed
Merge