Include doctrine
Merge pull request #118 from GrahamForks/doctrine

Include Doctrine
Migrating from heroku MySQL to PostgreSQL
Fixes