aligned .mk and .gyp files; minor change in util_test
Merge pull request #10 from dbeck/master

aligned .mk and .gyp files; minor change in util_test