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
Add support for table of contents, see http://brizzled.clapper.org/blog/2012/02/04/generating-a-table-of-contents-in-octopress/
Clean up formatting
Ignore automatically generated stylesheets
Remove duplicate line in sass/custom/_layout.scss
Reorganize table of contents plugin
Add app.net timeline plugin
Merge remote-tracking branch 'octopress/master'

Conflicts:
	Gemfile
	Gemfile.lock