Merge pull request #1258 from dorkster/fixes

Fix logic bug that could prevent upgrading powers
Prevent spawn powers placing creatures on non-empty tiles