Revert "Moving to $module instead of $plugin until the plugin repo is updated to accept the new format."

Plugin repo now supports the propper format.

This reverts commit cdc7c83d378f10b96d1400a533cd0b8c376d064e.

Conflicts:
	version.php
Merge branch 'master' into Release