Backporting changes from the branch oa.
Implementing some of the tips suggested in this article: http://codeinthehole.com/writing/pull-requests-and-other-good-practices-for-teams-using-github/
Deleted useless file.