Adds phone-b phone-a tablet-b tablet-a and cleans up options a bit

prune comments
Merge pull request #3 from alexwolfe/phone_tablet_before_after

Adds phone-b phone-a tablet-b tablet-a and cleans up options a bit