Updating with notes about this shiro_not_spring branch