One big ole commit.
Merge remote-tracking branch 'upstream/master'
Merge pull request #22 from lisafrench/master

Big ole commit.