Fixed issue with RubyPants and the Octopress hooks filter
Merge remote-tracking branch 'upstream/master'