.DS_Store added to .gitginore
some order to config
json diffing