Merge pull request #17 from abergeron/maint

Fix issues with cuda 6+ on mac and cmake 3.0.