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 https://github.com/imathis/octopress into source
pre-update commit
re-added source tree
Merge branch 'source' of github.com:kjaleshire/kjaleshire.github.com into source

Conflicts:
	Gemfile
	Gemfile.lock
	log/access.log