remove some complexity from discussions controller

This is an attempt to remove complexity and confusion around the discussion show action.
John was having a hard time understanding it so I thought it time to perhaps revisit it and give it a little love.  The discussions show and _motion partials have also benifitted slightly from this refactor.  There is still a lot to do as it is an unwieldily beast but it is a start.