Add gypi to fileTypes
Move whitespace match into the group to improve scope

Fixes #21.