Remove trailing whitespace
Switch to branchless Tempest

Also update to Cirros 0.3.1 alongway.
Add support for install from packages

Put the PFS related bits into a use_gitrepo block
Update tempest config template to Icehouse