* Remove unneeded patch lines which fail for the most recent CNTK version on the head of the git repo * Really check for NVML/GDK * Fix some violations