Changes for proper kernel linking
Merge branch 'master' of https://github.com/squiffy/Masochist-Template