Made more user friendly
-Config

Removed our server-specific settings.
Merge remote-tracking branch 'origin/master'