Upgraded Ruby
No more jasypt
Infinite history
Git so bad at merge
Merge branch 'master' into edge