changed the clean_from function in the parse.py to better get the names of users.
Merge branch 'Jack005-master'
removing comments and cruft from parse.py