Allow trial_end to be both an integer and a string.  Support trials ending "now".

Bump to 0.18