Cleanup.
Resolved merge conflict.
Added sentiment state restoring.
Merge branch 'master' of https://github.com/jasenmh/290D-Yelp

Forgot to pull before working on code. Looks like automerge succeeded.