Fixes #673 allow configuration of @return errors via requireReturn - (fi...

...xes #673).

Sorry I messed up the rebase, there was a massive number of merge conflicts and fixing them still resulted in a broken build so I created a new branch with the last squashed changes that passed all the tests copied over. The other PR is dead due to merge conflicts.