284 two default blocks

@stretchyboy 

In addition to fixing the original problem, I brought all the language files down a level so they'd match current Waterbear (unwritten) guidelines and merged all recent Waterbear changes in. So it's a big patch, but doesn't change much aside from fixing up a few `data-type=` specifications.