Commit 00eb8b6ad02d47825f2ab019d25b66a8b564ce16

Mark Ellzey 2015-12-20T02:17:25

Merge pull request #300 from ellzey/cmake_updates Cmake updates