Update master to where production is.

There have been changes to the production branch such as gem versions that need to be merged into master for proper development testing.