Set a fixed version for directory_watcher gem.
Update Gemfile.lock.
Merge branch 'master' of git://github.com/imathis/octopress into source