Review conf for different environments
Merge pull request #27 from dsanz/config

Review conf for different environments