Add fuubar gem for progress bar in Rspec output
Merge branch 'master' into bootstrap

Conflicts:
	Gemfile.lock