cleaned up desugaring of multiple ands or ors, and cleaned up
desugaring of s_if_else
Merge branch 'new-id' of github.com:brownplt/pyret-lang into new-id