Bumpy... after having a conversation with a guy at DCC I realized my expiration calcs sucked, so I fixed them. Also I accidentally cut out one of the main functions out of this last release, so it probably didn't work at all :S I got it back in there, with some new unit tests for expiration calculation and also limit overrides.

Enjoi! Please test!