Merge remote-tracking branch 'upstream/readme-formatting'
Merge remote-tracking branch 'upstream/mode-line-change'
Merge pull request #1 from rrthomas/master

Please update your master branch
Merge remote-tracking branch 'upstream/master'