DO NOT MERGE! - CYB-161 Use session[:canvas_user_id] or session[:canvas]['user_id']

Tests should & will break in this but we need this change for CYB-160 to work correctly. Also see #84
@coyote - please have a look at this