Merge branch 'master' of https://github.com/petebrowne/swfobject-rails into petebrowne-master

Conflicts:
	swfobject-rails.gemspec
	vendor/assets/javascripts/swfobject.js