Merge branch 'master' of https://github.com/jasonblanchard/writermortis into cacheing
Merge branch 'cacheing' of https://github.com/jasonblanchard/writermortis into cacheing
Added time expirations for cache