Bump sinatra to 1.3.5
Merge pull request #1074 from joneslee85/bump-sinatra

Bump sinatra to 1.3.5
state fresh with octopress master