cmake now builds test files
backup files removed
confict resolved in CMake files
Merge pull request #1 from rctoris/groovy-devel

backup files removed