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

Bump to 0.18
Merge pull request #31 from rustyconover/master

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