defaults module
Updated gemspec with new paths
Merge branch 'feature/defaults' into develop