Cherry pick ulken's additions
Switch back to 'old' gems for < 10.9 compatibility
Add updated workflow