Trying to fix magic.
Merge branch 'master' of github.com:AdamGagorik/darkstar