Merge tag '0.1.6' into develop

Updates to use mailchimp heroku addon
Updated production settings
Merge branch 'release/0.1.7'