Update to Ruby 2.1.1
Merge branch 'master' into mpm

* master:
  Update to Ruby 2.1.1
bundle update rake
remove local_path (will be change to a 'local' format)
reorder media / format relations