Merge pull request #9 from aproctor/master

Sync up with master
Merge pull request #10 from aproctor/master

thrillthrillthrillthrillthrillthrillthrillhouse
Merge pull request #19 from tylerhebenton/master

Merge pull request #9 from aproctor/master