Update files before messing with kernel
Merge branch 'master' of http://github.com/n-hutton/kernelMods

This merge is necessary because changes have been made on github