some files converted to rganisation without z
migrate to using s in organisations model
change file names to have s in organization  find . -name *rganization* | rename -v 's/rganization/rganisation/'
migrations for renaming organizations to organisation
organization changes
change new organization link text to resolve ambiguity
add rudimentary test for rake db:cat_org_import, and change z to s in several files'
make migration reversible
Merge branch 'Organiz_replace' of https://github.com/marianmosley/localsupport into Organiz_replace
ensure all migrations can be rolled back
include schema.rb in model renaming changes
Merge branch 'travis_debugger168' into Organiz_replace
Merge branch 'travis_debugger168' into travis_rollbackability
upgrade to rails 3.19
merges show categories with Organization rename
Merge branch 'Organiz_replace' into develop
Merge pull request #72 from apelade/travis_rollbackability

travis ensure all migrations can be rolled back
Merge branch 'develop' of https://github.com/AgileVentures/LocalSupport into develop
Merge pull request #74 from marianmosley/rails-3.2.19

upgrade to rails 3.2.19
Merge branch 'develop' into timo_show_pending_message

Conflicts:
	app/controllers/organizations_controller.rb
	features/individual_charity_pages/this-is-my-org.feature
	spec/controllers/application_controller_spec.rb
	spec/controllers/organisations_controller_spec.rb