Make the mergeupstream script executable
Merge upstream branch 'master' of
github.com:tansaku/LocalSupport into pin-ruby-version
Pin ruby to version 1.9.3 to make heroku consistent with my dev-test environment.

LocalSupport rake test tasks use ruby 1.9.3, but heroku used 1.9.2

This follows the recommendation from the Heroku installer:
-----> WARNINGS:
       you have not declared a Ruby version in your Gemfile.
       To set your Ruby version add this line to your Gemfile:"
       ruby '1.9.2'"
       See https://devcenter.heroku.com/articles/ruby-versions for more information.

At this moment, rake tasks used on my development VM are

    /usr/bin/ruby1.9.1 -S rspec ....
    /usr/bin/ruby1.9.1 -S bundle exec cucumber  --profile default

Although thanks to the mysteries of Debian

    $ /usr/bin/ruby1.9.1 -v
    ruby 1.9.3p194 (2012-04-20 revision 35410) [i486-linux]

Note that this pin is currently ignored in the dev-test environment, per this
message: "Ignoring `ruby` directive. This is a feature added to Bundler 1.2.0
and higher. Please upgrade if you would like to use it. "
Added 'all' marker for default all cats along with spec; swapped category and search boxes per client request
needed to remove noscript and scrolling-js to properly lose the old scrolling system
Merge branch 'master' of https://github.com/tansaku/LocalSupport into cat_swap
precompile production assets
Merge pull request #79 from mtc2013/cat_swap

Cat swap
simplifying the category/search layout
Failing test for open pages in seperate tabs
Passing specs but have to go back and do cukes
Updated to Rails 3.2.14 - failing some cukes due to lack of X server here
Upgrade ruby version used by travis-ci to match that deployed on heroku

Ruby 1.9.3
Merge branch 'rails32' into pin-ruby-version

Conflicts:
	Gemfile
Merge pull request #80 from dcorking/rails32

Updated to Rails 3.2.14
removing the unecessary js orgs stuff from infinite scroll, and some quick fixes to charity classifications
Merge branch 'master' into open_webpage_seperate
Added feature wrapping opening of donation url in seperate tab/window
Feature wrapping opening of org website link in new tab/window
Refactored step wrapping external website link to be more sensible