Warlock 2 and The Talos Principle Public Test Work

Tested on Ubuntu 14.04 64 bit.
Merge pull request #295 from suitablehost/master

Warlock 2 and The Talos Principle Public Test Work