Bulk changes after fork
Merge pull request #1 from jeffgeiger/master

Bulk changes after fork