Fix master dependening on DBAL 2.5-dev
Minor updates while reading the basic-mapping page

The only arguable changes involve a few spots where I either removed something I thought was too technical and not valuable (e.g. talking about the metadata mapping pattern).
Changes thanks to @Ocramius
Merge pull request #786 from weaverryan/patch-1

Minor updates while reading the basic-mapping page