Fix to support LLVM/ruby that ships with Xcode 5.1
Merge pull request #52 from seanknox/fix-xcode51-ruby

Fix to support LLVM/ruby that ships with Xcode 5.1
Fix team access check

The old API is now paginated, and was very inefficient anyway. This now
makes a request to a much more efficient endpoint to determine if a
given user is a member of a team
Merge pull request #53 from boxen/fix-team-access-check

Fix team access check
Upgrade to Rails 3.2.19

Fixes #56
Fixes #57
Merge pull request #58 from boxen/rails-up

Upgrade to Rails 3.2.19
Merge branch 'master' of github.com:boxen/boxen-web

# By Adam Ochonicki (1) and others
# Via Adam Ochonicki (3) and David Goodlad (1)
* 'master' of github.com:boxen/boxen-web:
  Upgrade to Rails 3.2.19
  Fix team access check
  Fix to support LLVM/ruby that ships with Xcode 5.1

Conflicts:
	Gemfile.lock
	app/views/splash/script.sh.erb

Merge branch 'master' of github.com:/boxen/our-boxen

Conflicts:
	Gemfile.lock
	Puppetfile
	Puppetfile.lock