[Finishes #76912006] bee conditional blocks should have text field

![image](https://cloud.githubusercontent.com/assets/1767466/3913906/54cc7e3c-233e-11e4-93f5-872cc5168be3.png)
instead of 
![image](https://cloud.githubusercontent.com/assets/1767466/3913910/6e8206b2-233e-11e4-86e6-346993f7b91a.png)

Biggest challenge is that this messes up all of our existing blocks, where we have a child math block nested.  I have a separate Dashboard PR that will attempt to fix these all up.