Only initialize nvm if it's installed
Default to same whitespace config for all file types
Merge remote-tracking branch 'origin/master'