Fix merge issues

git-svn-id: http://plugins.svn.wordpress.org/ga-link-tracker/trunk@913995 b8457f37-d9ea-0310-8a92-e5e31aec5664
Modified/updated readme
Merge branch 'master' of https://github.com/sesamechicken/GA-Link-Tracker