Simulator Button Changes

I took out clipboard copy to remove some security issues with certain
machines.
Merge remote-tracking branch 'origin/master' into Tracey