Merge in from 0.6-dev to try to get rid of that branch.  This doesn't compile at the moment, lots of changes!

git-svn-id: http://odamex.net/svn/root/branches/odaraven@3591 b0bcef46-2027-0410-bd56-ab726e9a1d04
The client compiles again.  However it's in a partially-working state.

git-svn-id: http://odamex.net/svn/root/branches/odaraven@3594 b0bcef46-2027-0410-bd56-ab726e9a1d04