recommiting after difficult ruby2 update. Unsure of git consquences