Fixed makefile
Consolidated settings files and improved SQL scripts
Updated Readme.md to reflect changes to SQL scripts and settings