Merge tag '2.0.1' into develop

2.0.1
configurable number of celery and hipache workers
Merge tag '2.0.2' into develop

2.0.2
since we're not using the field anymore, allow it to be blank
local settings cleanup
clean the email a bit in the API
loggers shouldn't crash when dealing with unicode strings
bump to 2.0.3
Merge branch 'release/2.0.3'