Fix for dependency issue
Fixes for compilation errors
Merge pull request #84 from jsight/cdi-compilefix

Fixes for compile issues pre-1.7 (diamond operator) and fixes for compile issue in cdi module