Dev

Merging branches after scripts updated to (1) subset starting.events in R as opposed to sending queries to MySQL and (2) including FIP metrics.