Add ORM: Ohm.
Resolve updates from upstream.

* master:
  r18n fixes
  R18n added
  DataMapper comment
  Add Testing: Spring and Third-party API: Flickr
  give a proper link to mongomapper
  Add E-Commerce and Payments: Paypal Merchant SDK.
  Add API Builder: ActiveModel::Serializers.
  Add Web Framework: Pakyow.
  Add a few gems related to mails and add a ORM for MongoDB
  add Berkshelf to package management
  add Typhoeus to http part

Conflicts:
	README.md
Merge pull request #42 from Erol/ohm

Add ORM: Ohm.