Tidy up parse_csv parsing and use it in Server

Straightforward change
Reviewers: @rec @mtrippled 

The old interface was so bad, no one wanted to call it