Fix up Makefile, more keyboard stuff, add astyle