Merge pull request #502 from williamherry/add_smtp_settings_to_gitignore_and_fix_comment

Add smtp settings to gitignore and fix comment

.gitignore

@@ -9,6 +9,7 @@ config/application.yml
 config/database.yml
 config/resque.yml
 config/unicorn.rb
+config/initializers/smtp_settings.rb
 coverage/*
 log/*
 tmp/*

config/initializers/smtp_settings.rb.sample

-# To enable smtp email delivery for your GitLab instance do next: 
+# To enable smtp email delivery for your GitLab CI instance do next:
 # 1. Rename this file to smtp_settings.rb
 # 2. Edit settings inside this file
-# 3. Restart GitLab instance
+# 3. Restart GitLab CI instance
 #
 if Rails.env.production?
   ActionMailer::Base.delivery_method = :smtp