Fixes in script/load_fixture
The machine is added to the test name

To avoid having a lot of tests that looks exactly the same in the lists and
directory name (but are different, in fact).
Reverting the changes introduced in cf065609aa121152abfc2f9
opensuse.pm adds a MACHINE job_setting
Temporary hack for displaying the MACHINE in the list
Merge pull request #71 from ancorgs/job_templates

Fixes in job_templates branch before merging