Added form objects
added bundler to development dependencies
fixed bad file name
Merge branch 'master' of github.com:noiseunion/do-toolbox

Conflicts:
	Gemfile.lock
	digital_opera.gemspec
	lib/digital_opera.rb
made the S3 service conditional on AWS actually being installed.