Updates for scala talk - refactoring flow.
Merge branch 'master' of github.com:killrweather/killrweather