Make sure form fields get a label from the model.

By default, redefining a model form field stops the default label pickup
from the model.
Add some more Selenium waits to fix Travis.