Cleaned up defaults module
Merge pull request #28 from aphearin/develop

Cleaned up defaults module