Merge pull request #1 from team1306/master

Merge in upstream changes.
Remove spam.
Merge pull request #2 from newtonwolfe/master

Remove some spam that showed up in team1306/gitclass