Fixed minor typos
Merge remote-tracking branch 'upstream/master'
I made these way better.
even more awesomer
Merged JMontague's awesomer changes