Added initial Spigot Support, use more proper variables
Merge branch 'master' of https://github.com/alfonsojon/minecraft-init