Sinatra now correctly returns code 404 when a page is not found. Closes #1198
Merge branch 'master' of git://github.com/imathis/octopress