Fixed Cascalog install
Merge pull request #347 from reddmetrics/feature/update-test-setup

Fixed Cascalog install
Created test suite as specification for merge-ts function
Pulled in Dan's tweaks to date-time namespace for merging ts
WIP for timeseries merging
Final functions for merging timeseries
Fleshed out tests and docs for timeseries merge functions
Added precondition in conversion from ts map to vec - must be consecutive
Changed merge-ts and overlap? to support any # of maps
Simplified merging time series, cleaned up related namespaces
Merge branch 'feature/dates-in-pail' of github.com:reddmetrics/forma-clj into feature/dates-in-pail
Fixed merge conflict
Trying to avoid circular dependencies by moving around a few functions
Fixed merge conflict
WIP