Merge branch 'release/0.2.5' into develop
defaults module
Updated gemspec with new paths
Merge branch 'feature/defaults' into develop
Quick tidyup
Release 0.3.0
Merge branch 'release/0.3.0'