updating plugin
Changed core a bit
Hopefully this does what I think it will do...
Merge branch 'master' into gh-pages