Merge pull request #113 from foursquare/master

Be more careful when injecting sibling resource dirs.