Updated to use cmake_modules
Updated to use cmake_modules
Updated to use cmake_modules
Updated to use cmake_modules
Merge pull request #325 from diecastzinc/indigo-devel

Updated changes, no indigo branch though.