836 refactor reservations controller

Resolves #836 

Actually, I'm going to go and write tests for this so don't merge until then

<!---
@huboard:{"order":905.0,"milestone_order":882,"custom_state":""}
-->