Fix tests by avoiding upgrade to rspec3.  Stop doing 12factor in anything but production