Allowing dashes in code names. Closes #1166
Accepting all non-whitespace characters as language names for Pygments code highlighting
Added support for deploying to github.io
Sinatra now correctly returns code 404 when a page is not found. Closes #1198
Merge branch 'master' of git://github.com/imathis/octopress

Conflicts:
	Gemfile