re-named plugin directory. Ready for wordpress svn
Merge remote-tracking branch 'origin/master'