Using new story_hashes instead of story object ids.
Merge branch 'story_hash_1' into story_hash_2

* story_hash_1:
  Adding story_hash to starred stories, user stories, and shared stories.
Merge branch 'master' into story_hash_2

* master:
  Switching to real prod database for migration.
  Fixing story hash migration to run by user.
Merge branch 'master' into story_hash_2

# By ojiikun (3) and others
# Via Samuel Clay (3) and ojiikun (1)
* master:
  Fixing Underscore in bookmarklet to handle sites with window.exports functionality, which breaks _. Thanks to @kyleniemeyer for finding the bug.
  Upping ulimit file descriptor limits.
  README.md typo fixes
  newline at end of readme
  Fix duplicate appearance of All Stories heading.
  Revert "Fix NPE on login."
  Fix NPE on login.
Using index in msharedstory search.
Fixing Global shared stories by checking for missing story hashes properly.
Another bug found by @kyleniemeyer's story. a - b was supposed to be b - a.
Merge branch 'story_hash_2' into circular

* story_hash_2:
  Another bug found by @kyleniemeyer's story. a - b was supposed to be b - a.
  Fixing Global shared stories by checking for missing story hashes properly.
  Using index in msharedstory search.
  Using new story_hashes instead of story object ids.

Conflicts:
	apps/social/models.py