Fix Resque::DirtyExit

Anytime you add a new location or created a new client/cms, it would fail on Resque::DirtyExit. This solution is kind of hard to explain, but fixes things. See me if you need more explanation...

https://www.pivotaltracker.com/story/show/79288386

I also need to squash some of these commits :$)