Revert "upstream changes"

This reverts commit 3767ee7f4ed470301c791f33a99a3ab77d006722.
directory_watcher 1.5.1 seems to break with this forked up octopress instance