Expire Blocks needs to include current block
Merge pull request #18 from msgilligan/msgilligan-jenkins

Fix issues in schema, clean up shell scripts a little