Comments, proper utf-8 encoding and pep8 clean

- just some simple fixings to make py2 compat work
3 jobs for adding-phone-number in 1 minute and 37 seconds (queued for 3 seconds)