Update scratchblocks2: Remove top stub on "else" if there's a cap block before
Update plugin folder name to match git repo name
Merge remote-tracking branch 'origin/master'