Update externals
Clean up override methods
Merge branch 'master' of github.com:benphelps/Probably