bundle udpate (hold back rspec)
Merge branch 'master' into bootstrap