CORE: Cleaned up code from previous commit.
Merge branch 'master' of https://github.com/DarkstarProject/darkstar into spikes