renamed varibles in rules to avoid conflicts; functions can now return K
Merge branch 'master' of https://github.com/kframework/k