Sinatra server now working correctly

Still can't test it, though
So it's an ordering thing

Wow

This saved me:
http://stackoverflow.com/questions/7481384/how-do-i-set-the-browser-lang
uage-in-cucumber-capybara
Refactor tests
Accept headers only
Request HTML
Return HTML for JSON

for now, until I make it HTML properly
Refactor features
Still no clue how to deal with this
Cleanup
Merge pull request #6 from pikesley/refactor

Refactor