Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	com/nevercast/BountyHunter.java
	com/nevercast/data/DataManager.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:Tjwato/BountyHunter
Remove old file, add plugin.yml to resources