Replaced old and busted with new hotness from Ryan Heppner.

Interns. They're good at stuff.
Merge branch 'master' of github.com:ThinkboxSoftware/Deadline