Pulled 1.1.1 from wp svn
clean up before 1.1.1