pull again

[Simon McVittie]

On 18/01/15 08:02, Alexandre Detiste wrote:
> Whoops, you missed my commit where I added "engine: everywhere.",
> that leaded on duplicate work on your side.

Sorry, I didn't update again while working on gdp yesterday evening.

I've merged all your changes, except for the removal of the doomsday
recommendation from hexen-demo-data (which is needed - the other
implementation of hexen-engine can't actually play the demo).

    S