Moved shiv to right place
Merge branch 'master' into gh-pages