Improvements to the regexes in setup_github_pages task
Merge remote-tracking branch 'octopress/2.1' into source

Conflicts:
	Rakefile