Implemented function composition operators '+' and 'o'

Also done some refactoring and commenting.
Merge branch 'master' of https://github.com/cwi-swat/rascal.git