Add intellij env files to ignore list.
Update gitignore
Update build library for bukkit 1.5
Merge remote-tracking branch 'upstream/master'