Added most 1.5 items & a fix for plugin.yml being moved to /src/ (mistake?)

Moved plugin.yml back to resources/, bukkit gets cranky about it..