Merge pull request #13 from StoicJester/master

approximately this
He also said this.

To Clair. In an elevator.
Updated quote per @Nimzor
He literally just said this.
Merge pull request #14 from foresmac/master

He also said this.
These words
Merge pull request #15 from projectweekend/master

These words
He said these two things minutes apart.
Merge pull request #16 from foresmac/master

He said these two things minutes apart.
hadn't pulled from upstream in awhile