user features involving time
fix merge
combine old features with loading new dataset
Merge pull request #1 from jasonost/vincent/time_features

user features involving time