Incorporates changes from Exercises in 3.5

Every exercise done except the sublime text running tests, as I'm
a vim user.