Manual edit of sql

In order to test out this branch, "new_sentiment_model" had to be merged in.  This branch reflects all of the changes in both branches.