Merge pull request #226 from brainwane/master

Typofixes in README
Merge pull request #227 from raorn/circular

Fix regression introduced by commit 3ad469a1c16f3de287f469b87ea6c2f5fcae...
Upping ulimit file descriptor limits.
Merge branch 'master' into circular

# By ojiikun (3) and others
# Via Samuel Clay (3) and ojiikun (1)
* master:
  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.
Small style change on profile.
Fixing Underscore in bookmarklet to handle sites with window.exports functionality, which breaks _. Thanks to @kyleniemeyer for finding the bug.
Merge branch 'master' into circular

* master:
  Fixing Underscore in bookmarklet to handle sites with window.exports functionality, which breaks _. Thanks to @kyleniemeyer for finding the bug.
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.
Merge remote-tracking branch 'upstream/master' into storyorder
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.
Minor style tweaks to story menu.
Removing duplicate client call in real-time server.
Better logging for unread counts.
Adding real ip to socketio.
Adding ip to connect and disconnect.
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
Use StoryOrder to determine sortOrder on calls into FeedProvider
Updating Android from v1.3 to v1.3.1, fixing duplicate All Site Stories bug.