From f3400d4654bfacecf7873d1064df607c287c09e2 Mon Sep 17 00:00:00 2001
From: mix irving <whimful@gmail.com>
Date: Sun, 8 Mar 2015 20:21:25 +1300
Subject: [PATCH 1/2] install dotenv to help managed env vars

---
 .example-env | 18 ++++++++++++++++++
 .gitignore   |  1 +
 Gemfile      |  1 +
 Gemfile.lock |  2 ++
 4 files changed, 22 insertions(+)
 create mode 100644 .example-env

diff --git a/.example-env b/.example-env
new file mode 100644
index 00000000..3e8752fb
--- /dev/null
+++ b/.example-env
@@ -0,0 +1,18 @@
+RAILS_ENV=development
+
+AWS_ACCESS_KEY_ID
+AWS_SECRET_ACCESS_KEY
+BUNDLE_GEMFILE
+SMTP_DOMAIN
+SMTP_PASSWORD
+SMTP_PORT
+SMTP_SERVER
+SMTP_USERNAME
+SSO_KEY
+
+## find the ENV currently in use in the app using : 
+##   grep -rIso -P "(?<=ENV)(\.fetch\(|\[).[A-Z_]+.(\)|\])" 
+
+# for a uniq ordered list of env vars:
+##   grep -rIsoh -P "(?<=ENV)(\.fetch\(|\[).[A-Z_]+.(\)|\])" | grep -oP "[A-Z_]+" | sort -u > temp 
+
diff --git a/.gitignore b/.gitignore
index d1889d2c..75aa3c26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 
 realtime/node_modules
 config/database.yml
+.env
 #public/assets
 
 # Ignore bundler config
diff --git a/Gemfile b/Gemfile
index e21cca7e..9489f21d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,6 +17,7 @@ gem 'rails3-jquery-autocomplete'
 gem 'best_in_place' #in-place editing
 gem 'kaminari' # pagination
 gem 'uservoice-ruby'
+gem 'dotenv'
 
 gem 'paperclip'
 gem 'aws-sdk'
diff --git a/Gemfile.lock b/Gemfile.lock
index e46dfc6b..98a5e233 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,6 +59,7 @@ GEM
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
+    dotenv (2.0.0)
     erubis (2.7.0)
     execjs (2.2.1)
     ezcrypto (0.7.2)
@@ -165,6 +166,7 @@ DEPENDENCIES
   cancan
   coffee-rails (~> 3.2.1)
   devise
+  dotenv
   formtastic
   formula
   jbuilder (= 0.8.2)

From 678ec1bbab5214db821520f0a4d0514b25f8badc Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Fri, 20 Nov 2015 14:34:05 +0800
Subject: [PATCH 2/2] Update windows installer docs

---
 README.md              |  3 ++-
 WindowsInstallation.md | 16 ++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 1e23d33b..9d3bfc90 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,8 @@ OR create a new account at `/join`, and use access code `qwertyui`
 
 Start mapping and programming!
 
-While we are still figuring out vagrant for Windows, there is an older set of instructions below
+We haven't figured out Vagrant for Windows yet, but we have a set of manual instructions here:
+
 - [For Windows][windows-installation]
 
 ## Contributing
diff --git a/WindowsInstallation.md b/WindowsInstallation.md
index 42364b44..fed11893 100644
--- a/WindowsInstallation.md
+++ b/WindowsInstallation.md
@@ -1,17 +1,13 @@
-First off, Metamaps runs on Ruby On Rails. Ruby 2.1.3 and Rails 3.2. You'll need to get Ruby and Rails installed on your computer if you don't already have it. Go to here for Ruby http://rubyinstaller.org/downloads/
+If you have any trouble with this process, contact us at team@metamaps.cc, and one of our developers may be able to help you out.
 
-You'll also need GIT: http://git-scm.com/download/win
+First, http://railsinstaller.org/en. This will install Ruby, Rails, and Git for you.
 
-It uses postgreSQL 9.2 as a database. You can install that for your computer from here: http://www.enterprisedb.com/products-services-training/pgdownload . During installation you can choose whatever database password you like. Make sure to note it down!
+Once you've done that, you will need to download PostgreSQL and node.js:
 
-Once you install those, open a 'command prompt with ruby'. 
+ - http://nodejs.org/en/download/
+ - http://www.postgresql.org/download/windows/
 
-to install rails
-    gem install rails -v 3.2
-    
-also download node.js, which is also needed http://nodejs.org/download/
-
-Navigate to the folder that you want to download the metamaps files to and run the following: (use your forked git repository address if it's different than this repo. You will also need to go to your Github account settings and add the SSH key that was placed in your clipboard earlier)
+Now open a terminal, and navigate to the folder that you want to download the metamaps files to and run the following:
 
     git clone https://github.com/metamaps/metamaps_gen002.git --branch develop
     cd metamaps_gen002