Gitignore update, Cleaning up user settings
Gitignore update
Merge remote-tracking branch 'origin/master' into dev.service