Merge pull request #18 from osuosl/develop

Bring master back to where it was.
Merge pull request #19 from osuosl/master

Merge pull request #18 from osuosl/develop