Update .gitignore

Added Mac .DS_Store ignores
Updated config handler to auto-load default config from certain default locations, this can be overridden by calling LoadConfig at a later stage if needed
Fixed some small config blunders
Merged latest from master