Merge pull request #1 from StevenEBarbaro/master

grabbing upstream
Now loads HTTP server information in config/config.js, and database connection information in config/database.js.
Merge pull request #1 from cbebry/master

Merging cbebry's Configuration changes