Minor fixes.
Merge branch 'master' of github.com:nextreamlabs/Brrr

Conflicts:
	Brenzo/Gemfile