Fixes for parsing self and content symbols in effects. These are keywords.
Added effect signatures to collection methods
Merge branch 'master' of github.com:DaMSL/K3-Core