do not append variable name to calculation names #268

Fixed tests.
Merge branch 'master' into i238-icclim