cleaned up some requires; added methods to expire and unexpire accounts now and at a future time
Merge pull request #1 from brendte/cleanup-and-add-expiration-methods

cleaned up some requires; added methods to expire and unexpire accounts ...