Merge branch 'master' of git://github.com/imathis/octopress into release-2.3

Conflicts:
	README.markdown
working on release 2.3 docs
Updated for 3.0 release
preparing for release 3.0
Merge remote-tracking branch 'origin/source' into release-3.0

Conflicts:
	README.markdown
Updated to new release info
Updated RDiscount, added footnotes and other extensions
Removed a couple of buggy filters on RDiscount (for now)
Footnotes styling updates
Recent posts sidebar now correctly observes titlecase settings
Fixed release post
Typo fixes
Added the Javadoc
Merge remote-tracking branch 'octopress/master' into release-3.0
Fixed typo's
Merge pull request #2 from crawljax/release-3.0

Release 3.0