removed unnecessary plugins
Merge branch 'master' of github.com:johnheimkes/wordpress
upgraded base plugins
killed old plugins
Merge branch 'master' of github.com:johnheimkes/wordpress