adding support for multiple Graphite date formats for from and until

I guess it can be done in a nicer way, but this works now
If you've parsed it successfully, then you know 's' is already an epoch.  You can return it directly without going through a timestamp.