Merge pull request #495 from jbrodman/master

knc.h cleanup