Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	ChangeLog.md
	README.md
	plugin-name/admin/class-plugin-name-admin.php
	plugin-name/plugin-name.php
	plugin-name/public/class-plugin-name.php
	plugin-name/trunk/README.txt
	plugin-name/uninstall.php

Merge pull request DevinVinson#187 from defries/master

Added grunt-wp-i18n solution for i18n-ing the plugin

updating the change log to reflect the latest tag

initial commit of the rewrite

updating for 2.6.1

Signed-off-by: Tom McFarlin <[email protected]>

finalizing the change log

updating a reference to the plugin slug

fixes DevinVinson#52

updating the docblock for this class

updating the change log for 2.4

logging updates for 2.3.0