fixing colon-keywords and adding and/or/not keywords
Merge branch 'master' of github.com:brownplt/pyret-lang