Merge pull request #1 from ProjectSkyfire/master

Updates from bootz
Merge pull request #2 from ProjectSkyfire/master

Update from SkyfireEMU
Missing the file type
Merge pull request #856 from kem008/master

Missing file type