Stream tweaks
Merge branch 'master' of github.com:martinehrenstein/iwillifyouwill

Conflicts:
	models/user.rb