cleaned up swfobject and added it to the grunt file
merge fix