diff --git a/config/application.yml.example b/config/application.yml.example
index 84bd467e2..858732825 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -18,6 +18,17 @@
 # name that appears on the site, eg. in page titles
 GROWSTUFF_SITE_NAME: Growstuff (dev)
 
+# Mandrill is used to send transactional email (eg. signup
+# confirmations).  If using Heroku connect to Mandrill via Heroku addons
+# list then go to tools menu (upper right) and choose "SMTP and API
+# Credentials"
+GROWSTUFF_MANDRILL_USERNAME: "dummy"
+GROWSTUFF_MANDRILL_APIKEY: "dummy"
+
+# Paypal is used for payments, obviously.
+GROWSTUFF_PAYPAL_USERNAME: "dummy"
+GROWSTUFF_PAYPAL_PASSWORD: "dummy"
+GROWSTUFF_PAYPAL_SIGNATURE: "dummy"
 
 ##############################################################################
 # Other environments (you can override the above for staging,
diff --git a/config/environments/development.rb b/config/environments/development.rb
index c3fd9af6b..901172b12 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -46,11 +46,10 @@ Growstuff::Application.configure do
   config.action_mailer.smtp_settings = {
       :port =>           '587',
       :address =>        'smtp.mandrillapp.com',
-      :user_name =>      ENV['MANDRILL_USERNAME'],
-      :password =>       ENV['MANDRILL_APIKEY'],
+      :user_name =>      ENV['GROWSTUFF_MANDRILL_USERNAME'],
+      :password =>       ENV['GROWSTUFF_MANDRILL_APIKEY'],
       :authentication => :login
   }
-  config.action_mailer.delivery_method = :smtp
 
   config.host = 'localhost:8080'
   config.analytics_code = ''
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5093ed694..dd083c726 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -72,8 +72,8 @@ Growstuff::Application.configure do
   config.action_mailer.smtp_settings = {
       :port =>           '587',
       :address =>        'smtp.mandrillapp.com',
-      :user_name =>      ENV['MANDRILL_USERNAME'],
-      :password =>       ENV['MANDRILL_APIKEY'],
+      :user_name =>      ENV['GROWSTUFF_MANDRILL_USERNAME'],
+      :password =>       ENV['GROWSTUFF_MANDRILL_APIKEY'],
       :domain =>         'heroku.com',
       :authentication => :plain
   }
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index db50587d1..3ddce2c31 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -72,8 +72,8 @@ Growstuff::Application.configure do
   config.action_mailer.smtp_settings = {
       :port =>           '587',
       :address =>        'smtp.mandrillapp.com',
-      :user_name =>      ENV['MANDRILL_USERNAME'],
-      :password =>       ENV['MANDRILL_APIKEY'],
+      :user_name =>      ENV['GROWSTUFF_MANDRILL_USERNAME'],
+      :password =>       ENV['GROWSTUFF_MANDRILL_APIKEY'],
       :domain =>         'heroku.com',
       :authentication => :plain
   }
diff --git a/credentials.example b/credentials.example
index 045e8f4d2..bb6feab48 100755
--- a/credentials.example
+++ b/credentials.example
@@ -26,13 +26,6 @@
 # don't need to for your dev machine though.)
 export RAILS_SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
-# Mandrill is used to send transactional email (eg. signup
-# confirmations).  If using Heroku connect to Mandrill via Heroku addons
-# list then go to tools menu (upper right) and choose "SMTP and API
-# Credentials"
-export MANDRILL_USERNAME=""
-export MANDRILL_APIKEY=""
-
 # Used for connecting member accounts to Twitter
 # Get Twitter key from https://dev.twitter.com/apps
 export TWITTER_KEY=""