Bunch o stuff.
Merge branch 'master' of github.com:LasVegasRubyGroup/soapbox

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/bootstrap.js.coffee
...
bundled