Allow PIL to be installed via pip

However, we should switch to Pillow at some point.
Merge branch 'master' into account-creation-fixes