Stubbing out new bookmarklet with readability script.
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into ipad

Conflicts:
	.gitignore
Handing over url to iPad app during social connect.
Merge branch 'master' into bookmarklet

* master:
  Handing over url to iPad app during social connect.
ftux
OAuth -> OAuth 2! For a better feed import experience.
Vendored OAuth2 library + migration.
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into ipad
Adding gflags and fixing facebook website on import.
Merge branch 'master' into bookmarklet

* master:
  Adding gflags and fixing facebook website on import.
  Vendored OAuth2 library + migration.
  OAuth -> OAuth 2! For a better feed import experience.
Modified socialfeed style for item lists.
Cleaning up text on share bookmarklet.
Adding auto_active flag to reader import, for the iPad.
Modified feed row item style accordingly.
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into ipad
Merge branch 'master' into bookmarklet

* master:
  Adding auto_active flag to reader import, for the iPad.
Formatting article.
Adding feed count to google reader import endpoint.
Merge branch 'master' of https://github.com/samuelclay/NewsBlur into ipad
Forcing re-approval on Google Reader import.