Merge pull request #39 from ensiform/master

Merge the ent spawn code changes (cleans up cgame/game side stuff)
Merge pull request #41 from ensiform/master

Various goodness
Merge remote-tracking branch 'upstream/master'