Fix wrong return type in documentation
Allow every string value of the configuration file to contain ERB
Merge branch 'master' of github.com:yadevteam/mongoid-giza