Add test for uniform/attribute naming conflicts.
Merge pull request #245 from greggman/add-naming-conflict-test

Add test for uniform/attribute naming conflicts.