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

Conflicts:
	Gemfile
updating Octopress - Lord have mercy
Merge branch 'source' of github.com:znmeb/znmeb.github.io into source