Merge pull request #1 from jadar/bleeding

latest 1.7 code
Merge branch 'forge-bleeding' into forge
removed bukkit code from forge branch
updated git ignore