updates for changes in alchemy and bastion
Merge pull request #14 from thomasmckay/bastion-rebase

updates for changes in alchemy and bastion