[bug #926892] Nix manufacturer from Firefox OS form

This tweaks the code so that we no longer split the device name into
manufacturer and device but instead stick the whole thing in the device
column. This lines up with what the feedback form in settings in Firefox
OS will do (bug #851189).

Quick r?