cleanup? I think.
Merge branch 'master' of https://github.com/jcopetre/Python_Thinkful