Added lifting for unary and binary operators
Merge branch 'master' of github.com:sjolsen/sjo