Check for unique indices
Merge pull request #210 from kyleabeauchamp/two_fixes

Check for unique indices