Updated Jekyll (1.0.0.beta4) and other gems. Added new pagination_path feature to blog index template
updated classic theme configuration to support the latest pagination updates
Sinatra now correctly returns code 404 when a page is not found. Closes #1198
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1

Conflicts:
	Gemfile
	Gemfile.lock
Update Octopress.