Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom

MacInstallation.md

@@ -1,3 +1,5 @@
+If you are doing an upgrade and or recent pull for changes you will need to change your default ruby package from 2.1.1 to ruby 2.1.2
+
 install homebrew
 
     \curl -sSL https://get.rvm.io | bash -s stable --rails

UbuntuInstallation.md

@@ -1,3 +1,12 @@
+If you are doing an upgrade and or recent pull for changes you will need to change your default ruby package from 2.1.1 to ruby 2.1.2
+to do this use this command
+    rvm install ruby-2.1.2
+once the download is finished select that package as your default
+    rvm default ruby-2.1.2
+then 
+    bundle install
+now you are good to go with normal execution
+
 Firstly this walkthrough is done with a 14.04 32bit install of Ubuntu.
 
 All commands that I could are terminal based.

WindowsInstallation.md

@@ -1,5 +1,7 @@
 First off, Metamaps runs on Ruby On Rails. Ruby 1.9.3 and Rails 3.2. You'll need to get Ruby and Rails installed on your computer if you don't already have it. We recommend using the Rails Installer, which you can download from Mac or Windows at http://railsinstaller.org/en (see the notes below about Ubuntu). This will get you set up perfectly with the right versions of Ruby, and Rails for running your local version of Metamaps.
 
+If you are doing an upgrade and or recent pull for changes you will need to change your default ruby package from 2.1.1 to ruby 2.1.2
+
 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 install those, open a 'command prompt with ruby and rails'. 

app/views/layouts/_lightboxes.html.erb

@@ -170,6 +170,10 @@
 
         <p>Financial contributions are greatly appreciated in support of our work. All financial contributions are transparently governed and recorded in our value accounting system.</p>
 
+        <script data-gratipay-username="Metamaps.cc" src="//gttp.co/v1.js" style=display:inline;></script>
+        //TODO add bitcoin wallet payment link.
+        <img src="/assets/RibbonDonateBitcoin.png" alt="DonatewithBitCoin" link="" style=display:inline;>
+
         <div class="clearfloat"></div>
       </div>