Fix spelling error
Merge pull request #1443 from wickedshimmy/patch-1

Fix spelling error
Add note about current stable version of Octopress to README.

Fixes #1451.
Updated makefile
Merge branch 'master' of git://github.com/imathis/octopress into source

Conflicts:
	README.markdown
Big update with a lot of new posts, plus a simple plugin to quickly link to my public dropbox folder for all pictures.