Rolls these files back which were incorrectly merged
Removes the bblockly and blockly applications, and renames blockly-node3 to blockly