Issue #362: Renamed & re-ordered custom block form fields.

Addresses https://github.com/backdrop/backdrop-issues/issues/362.

New look:
![custom_block_form](https://cloud.githubusercontent.com/assets/2385329/4729116/d65273c2-597f-11e4-8e94-3dcbdc0e2042.png)