Ignore assets.old
Merge pull request #1164 from xuhdev/patch-2

Ignore assets.old
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1