Adding a needed parameter to @Instance

Adding a needed parameter to @Instance to avoid problems.
Merge pull request #678 from theflogat/patch-1

Adding a needed parameter to @Instance
Working on keybindings, going to test a FML fix for SimpleNetworkWrapper later
Merge remote-tracking branch 'origin/master'
Working keybinding listener, and first stab at the ObjectHolder (some more learning necessary it seems, so commented out at the moment)
Missed some files