adding options to update_attributes to make it rails 3.1 compatible
add actionpack as a development dependancy

spec helper requires action_controller, which is part of actionpack
Fix for proxy when adapter modifies the passed config

In the case of a badly behaving connection adapter that modifies the configuration hash it is given, it is possible for a Octopus::Proxy instance to be initialized with an invalid configuration hash.

Using Octopus in a threaded environment causes a new Octopus::Proxy to be created for each thread (see Octopus::Model#connection_proxy).

A badly behaving adapter may alter the configuration hash passed to it.

As the configuration hash for is memoized and reused an Octopus::Proxy instance will be initialized with an invalid configuration hash in threads subsequent to the first, failing with the error "Please install the  adapter: `gem install activerecord--adapter` (cannot load such file -- active_record/connection_adapters/_adapter)" when the "adapter" key can not be found in the hash.

To avoid this happening the config hash is duplicated before handing to the connection adapter.
Merge pull request #70 from peer2/master

The syntax for this has changed with rails 3.1 (optional parameter)
Added integration with ActiveRecord instrumentation for better logging support for Rails 3+
Spec name tweak
Update lib/octopus.rb
Merge pull request #66 from matsadler/master

Fix for proxy when adapter modifies the passed config
Merge pull request #71 from kanevski/master

Improved logging integration for Rails 3+
Replaced Gem::Version with ActiveSupport::VERSION::MAJOR/MINOR
Merge pull request #73 from john/master

Switched to ActiveSupport::VERSION::MINOR for version detection
Fixed Rails 2 compatibility, where the active_support/version is not preloaded.
Merge pull request #76 from kanevski/master

Fix to Rails 2 compatibility
Fixing update_attributes on rails 3.0.x

The persistence hooks don't use the arguments so they can be ignored for
the most part.
Ignore vim swap files.
Generalize the require to ActiveSupport class extensions.

Rails 3.2 changes inheritable_attributes to just attribute and this will
work across both versions. This adds a few extensions that Octopus isn't
using but nothing that ActiveRecord probably doesn't bring in on it's
own.
Removing MetricFu due to it not working on 1.9.3.

MetricFu depends on Rcov which is not compiling on 1.9.3 (which is
arguably the Future(tm)).
Add rails32 appraisal and remove generated gemfiles.

Part of the getting started process is to run rake appraisal:install so
these files will be regenerated again anyways. Plus they are
auto-generated which seems odd to keep in source control.
Rails 3.2.x compatability.

Replaced write_inheritable_attribute and read_inheritable_attribute with
class_attribute. This required renaming establish_connection and
set_table_name since they attempted to overload existing class methods.

Changed from #set_table_name to #table_name= since set_table_name is
deprecated.

proxy_spec.rb:50 is currently broken inside of ActiveRecord's connection
pool's #checkout method.
Shameless renaming of tables to include an underscore before the number.

Also includes a refactoring of creating and dumping tables and using the
environment variable for mysql user in testing shards config.