Merge pull request #34 from armm77/master

Wintergrasp R3.1
Some more work on Wintergrasp.
Some more bad code removed. Note that this is not yet tested properly.