support for space in file name + percent in width/height#1605

ironbishop wants to merge 2 commits intoimathis:masterimathis/octopress:masterfrom

ironbishop:patch-1ironbishop/octopress:patch-1Copy head branch name to clipboard