Major cleanup of Gemfiles and README, passes all tests