Display active project in the modeline
Fix a typo
Docstring improvements
Merge remote-tracking branch 'upstream/master'