Merge branch 'master' into drive_api

Conflicts:
	README.rdoc
	google_drive.gemspec
	lib/google_drive.rb
	lib/google_drive/acl.rb
	lib/google_drive/acl_entry.rb
	lib/google_drive/collection.rb
	lib/google_drive/file.rb
	lib/google_drive/session.rb
	lib/google_drive/spreadsheet.rb