Octopus 0.6 will not support Rails 4
Improving spec config file
Octopus 0.6.0
Upgrading rails version of the SampleApp to Rails 3.2
Upgrading cucumber / rails fixes on SampleApp
More changes to upgrade Rails version of the SampleApp
Cleaning database.yml and Gemfile
Database cleaner should be in the sample app Gemfile
Adding pledgie badge to Readme
Cleaning spec helper
Re-add Gemfiles created by Appraisal.  Correct errors in .travis.yml.  Eliminate bundle install
Only create protocol_shard if Rails 3.2
Eliminate stub deprecation warnings
Fix typo
Add a pending message indicating that this test was failing.
Merge branch 'master' of github.com:tchandy/octopus

Conflicts:
	lib/octopus/version.rb
Merge branch 'feature/fix_travis_config' of github.com:bricknmo/octopus