fixed some things with the build system
Merge branch 'master' of ssh://github.com/itsjareds/gammaknife

Conflicts:
	CMakeLists.txt