Update a bunch of modules
Update a bunch of gems
Merge remote-tracking branch 'upstream/mavericks-updates'

* upstream/mavericks-updates:
  Update a bunch of gems
  Update a bunch of modules