Add deleted ./kernel/arch/x86/Makefile
Remove sdk/bootdisk from .gitignore
Merge pull request #4 from AaronO/master

Extra fixes