Update test/index.html

Tests should work from grunt now...
fixed merge conflict, removed redudant tags
fixed merge conflict, removed redudant tags