Stop pillows before migrate

http://manage.dimagi.com/default.asp?112592

The first commit is just cleanup