Merge branch 'fffix' of https://github.com/rdwallis/GWTP
Merge branch 'master' of https://github.com/ArcBees/GWTP
Merge branch 'master' of https://github.com/ArcBees/GWTP
Better formfactor detection
remove silk already matched by (android|kindle)
Merge pull request #454 from rdwallis/ffregexfix

Some fixes for formfactor