oops, don't know why I left of the cross browser stuff.
didn't need this
changed back to index
Merge branch 'master' into gh-pages