Changes during hangout.
Merge branch 'master' of https://github.com/scalapro/scalabits