Set a fixed version for directory_watcher gem.
Update Gemfile.lock.
Merge branch 'master' of github.com:imathis/octopress into source
修正了一些博文错误