OSX was still not always finding puppet gem.

Changed test-system to test as both root and normal user.
use su -c to install puppet gem
merge latest and reset language
OSX Testing
OSX Testing
OSX Testing
Travis OSX Testing
Ubuntu Testing