better formfactor

Resubmitting to solve the merge conflicts in the previous branches.

I've also made the regex more human readable.

Still works against a large number of devices that GWT itself does not support.  I don't think there is any cost to this but with the more human readable regex it should be easy for you to remove the matches you don't want.