Keyboard stuff and updating Makefile for /u/Dascandy. Thanks!

Signed-off-by: Campbell Watson <campbell-watson@outlook.com>
Mergedown