Fix spec
Add 'Association' class, a subclass of Organisation.
Add 'Company' class, a subclass of Organisation.
Allow for customised templates based on current organisation's class.

Adds a new ActionView resolver, OrganisationResolver, which looks for a
template in a subdirectory named after the current organisation's class, in
preference to the default template in the default location.
Merge remote-tracking branch 'origin/v1.x'

Conflicts:
	Gemfile.lock
	app/controllers/members_controller.rb
	features/step_definitions/proposal_steps.rb
	features/support/paths.rb
	spec/requests/single_organisation_mode_spec.rb
	spec/views/layouts/application.html.haml_spec.rb
Make OrganisationResolver work with partials.
Separate Association-specific code from general Organisation code.
Fix that 'Setting up an installation' would fail when run within the suite.

Although it passed when run independently, this feature would fail when
running the whole feature suite. Previous features set the test driver domain
to 'something.smackaho.st'. This setting would stick when running the 'Setting
up an installation' feature, but this feature expects to find results at
'www.example.com'.
Move partials used in layouts into 'shared' directory.
Remove check for pre-1.0.0 version which would add '(beta)' to the version.
Bump version to 2.0.0alpha1.
Make RSpec controller specs work with OrganisationResolvers.
Feature: Adding a company. Closes #271.
Upgrade delayed_job to fix YAML conflict in recent Rubygems/Bundler.
Pin state_machine to 1.0.0, to avoid RuntimeError in FoundAssociationProposal#after_reject.
On 1.9, use built-in FasterCSV.
Jiggle RSpec/Cucumber versions to pick up some fixes we need.

rspec-mocks-2.6.0 includes a fix that allows an array containing mock objects to be flattened.

capybara-1.0.0 includes a fix to its use of the selenium-webdriver API, which was broken when using #select to select options from a select element.

Some of our Capybara domain juggling is no longer necessary with capybara-1.0.0.

The workaround for installing OrganisationResolvers under RSpec controller specs needed updated due to internal design changes in rspec-rails-2.6.0.
Fix an overlooked logic error in salt generation for Member passwords.
Scenario: Director records minutes. Part of #235.
Update faker to fix deprecated use of Object#returning.