Fix more spacing problems. Also use unicode instead of repr.
Merge remote-tracking branch 'upstream/master'
Don't mess with comments. Just add them.
Remove needless underscore from names.
Merge pull request #115 from gwelymernans/master

Fix some spacing issues