Merge branch 'version-1.2'
Fixed postion of function (Previously caused plugin to crash)
Remove more dead files
Syncing with upstream/master

Merge branch 'master' of https://github.com/Robdel12/DropKick